[Angstrom-devel] Koen Kooi : angstrom: move u-a selector into packageformat include

[Angstrom Git Repos]

Module: meta-angstrom
Branch: master
Commit: 020b7341aca2d7cef1783e84fa8030ed915a6d78

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Mon Jan 16 12:03:31 2012 +0100

angstrom: move u-a selector into packageformat include

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 conf/distro/angstrom-2010.x.conf             |    4 ----
 conf/distro/include/angstrom-package-ipk.inc |    7 +++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 5798c37..ca088eb 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -167,10 +167,6 @@ DISTRO_FEED_CONFIGS = "${ANGSTROM_FEED_CONFIGS}"
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
 IPKG_VARIANT = "opkg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
 
-# we need the same provider for opkg and u-a
-PREFERRED_PROVIDER_virtual/update-alternatives = "opkg"
-VIRTUAL-RUNTIME_update-alternatives = "opkg"
-
 # Select xserver-xorg as default, since kdrive has been EOL'ed
 XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" 
 
diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc
index 92516a0..4ce0c5e 100644
--- a/conf/distro/include/angstrom-package-ipk.inc
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -1,8 +1,11 @@
 INHERIT += "package_ipk"
 
-ROOTFS_PKGMANAGE = "opkg opkg-config-base angstrom-feed-configs"
+EXTRAOPKGCONFIG =  "opkg-config-base angstrom-feed-configs"
 
 DISTRO_UPDATE_ALTERNATIVES = "update-alternatives-cworth"
 
+# we need the same provider for opkg and u-a
 PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg"
+VIRTUAL-RUNTIME_update-alternatives = "opkg"
+