From 14e08075a40d8959332f6f8c1f70d4d129544f9d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 22 Jan 2014 10:30:06 -0800 Subject: [PATCH] Adjust to the omission of opkg UPDATE_ALTERNATIVES change from OE-Core Signed-off-by: Khem Raj --- conf/distro/include/angstrom-package-deb.inc | 3 --- conf/distro/include/angstrom-package-ipk.inc | 4 ++-- recipes-images/angstrom/systemd-image.bb | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc index e060bb1..c7a460d 100644 --- a/conf/distro/include/angstrom-package-deb.inc +++ b/conf/distro/include/angstrom-package-deb.inc @@ -1,4 +1 @@ INHERIT += "package_deb" - -PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index b37717e..7e0c68c 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -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}" diff --git a/recipes-images/angstrom/systemd-image.bb b/recipes-images/angstrom/systemd-image.bb index 15bd2d0..4f64ae7 100644 --- a/recipes-images/angstrom/systemd-image.bb +++ b/recipes-images/angstrom/systemd-image.bb @@ -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 \