zepto-forks/meta-mortsgna
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust to the omission of opkg UPDATE_ALTERNATIVES change from OE-Core

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2014-01-22 10:30:06 -08:00
parent 477fda63ae
commit 14e08075a4
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/distro/include/angstrom-package-deb.inc
View File

@@ -1,4 +1 @@
INHERIT += "package_deb"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"

4
conf/distro/include/angstrom-package-ipk.inc
View File

@@ -4,12 +4,12 @@ ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
EXTRAOPKGCONFIG = "opkg-config-base ${ANGSTROM_FEED_CONFIGS}"
ANGSTROM_IPK_UPDATE_ALTERNATIVES ?= "opkg"
ANGSTROM_IPK_UPDATE_ALTERNATIVES ?= "opkg-utils"
DISTRO_UPDATE_ALTERNATIVES = "${ANGSTROM_IPK_UPDATE_ALTERNATIVES}"
# we need the same provider for opkg and u-a
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
PREFERRED_PROVIDER_virtual/update-alternatives = "${ANGSTROM_IPK_UPDATE_ALTERNATIVES}"
VIRTUAL-RUNTIME_update-alternatives = "${ANGSTROM_IPK_UPDATE_ALTERNATIVES}"

3
recipes-images/angstrom/systemd-image.bb
View File

@@ -15,7 +15,8 @@ IMAGE_INSTALL += " \
angstrom-packagegroup-boot \
packagegroup-basic \
${CONMANPKGS} \
${ROOTFS_PKGMANAGE_PKGS} update-alternatives-cworth \
${ROOTFS_PKGMANAGE_PKGS} \
update-alternatives-opkg \
systemd-analyze \
fixmac \
cpufreq-tweaks \