10 files changed, 18 insertions, 16 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index c15dbbd0e1..26614adb72 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -127,7 +127,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_hotplug               = "udev"
-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg"
+PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
 
 # The default is too old for linux-libc-headers-2.6.31:
 PREFERRED_VERSION_mplayer                = "0.0+1.0rc2+svnr29789"
@@ -145,6 +145,9 @@ require conf/distro/include/angstrom${ARM_ABI}.inc
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
 IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
 
+# we need the same provider for opkg and u-a
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+
 # 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-deb.inc b/conf/distro/include/angstrom-package-deb.inc
index 3dbb175f93..e060bb1ccf 100644
--- a/conf/distro/include/angstrom-package-deb.inc
+++ b/conf/distro/include/angstrom-package-deb.inc
@@ -1,4 +1,4 @@
 INHERIT += "package_deb"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+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 a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/angstrom-package-ipk.inc
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -1,5 +1,4 @@
 INHERIT += "package_ipk"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc
index 4f38b8f936..d953d6ebe0 100644
--- a/conf/distro/include/sane-feed-deb.inc
+++ b/conf/distro/include/sane-feed-deb.inc
@@ -2,5 +2,5 @@
 
 INHERIT += "package_deb"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/sane-feed-ipk.inc b/conf/distro/include/sane-feed-ipk.inc
index a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/sane-feed-ipk.inc
+++ b/conf/distro/include/sane-feed-ipk.inc
@@ -1,5 +1,4 @@
 INHERIT += "package_ipk"
 
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 92d50d472a..b99c895dc2 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -158,11 +158,9 @@ require conf/distro/include/sane-toolchain.inc
 #############################################################################
 PREFERRED_PROVIDER_gpsd = "fso-gpsd"
 PREFERRED_PROVIDER_atd = "atd-over-fso"
-PREFERRED_PROVIDER_opkg= "opkg"
+PREFERRED_PROVIDER_opkg = "opkg"
 PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
 PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "opkg-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "opkg"
 
 #############################################################################
 # PREFERRED VERSIONS
diff --git a/recipes/opkg/opkg-native_svn.bb b/recipes/opkg/opkg-native_svn.bb
index 1de472e156..e5fdfd027f 100644
--- a/recipes/opkg/opkg-native_svn.bb
+++ b/recipes/opkg/opkg-native_svn.bb
@@ -2,6 +2,7 @@ require opkg.inc
 
 DEPENDS = "curl-native"
 PR = "${INC_PR}"
+PROVIDES =+ "virtual/update-alternatives-native"
 
 SRC_URI += "file://opkg-libdir.patch;patch=1;maxrev=342"
 
diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index c973174787..1716034429 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "curl gpgme"
 PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r16"
+INC_PR = "r18"
 
 FILESPATHPKG =. "opkg:"
 
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index 57b2774b65..44c0baf880 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -4,6 +4,8 @@ DEPENDS_append = " openssl"
 
 PR = "${INC_PR}"
 
+PROVIDES =+ "virtual/update-alternatives"
+RPROVIDES_${PN} = "update-alternatives"
 PACKAGES =+ "libopkg-dev libopkg"
 
 FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb
index 0ce9ee4415..04c55357a8 100644
--- a/recipes/tasks/task-boot.bb
+++ b/recipes/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r50"
+PR = "r51"
 
 inherit task