Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5

14 files changed, 49 insertions, 152 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index abc9a936d6..26614adb72 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -87,21 +87,6 @@ PREFERRED_VERSION_glibc-initial 	?= "2.9"
 PREFERRED_VERSION_uclibc        	?= "0.9.30.1"
 PREFERRED_VERSION_uclibc-initial	?= "0.9.30.1"
 
-# Preferred provider for virtual/psplash
-# This enforces a specific brand to be used, in our case the angstrom
-# one. In case you want to change the logo or something like that we
-# suggest you to create another recipe (e.g: psplash-<brand>) for that
-# and add that into your image.
-# You can also opt to change or override this line, but that isn't
-# needed because psplash is using update-alternatives.
-PREFERRED_PROVIDER_virtual/psplash               ?= "psplash-angstrom"
-
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
-PREFERRED_PROVIDER_virtual/gail    ?= "gtk+"
-
-PREFERRED_PROVIDER_libfribidi = "fribidi"
-
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
 ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
@@ -140,33 +125,10 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 # Toolchain virtuals:
 require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 
-# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
-PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700            ?= "hostap-modules"
-
-PREFERRED_PROVIDER_virtual/db           ?= "db"
-PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
-PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
-
-# Others:
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
-PREFERRED_PROVIDER_esound               ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf                ?= "gconf"
-PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib                ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp                  ?= "ntp"
 PREFERRED_PROVIDER_hotplug               = "udev"
-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg"
-PREFERRED_PROVIDER_libxss                = "libxss"
-PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
-PREFERRED_PROVIDER_bluez-libs            = "bluez4"
-PREFERRED_PROVIDER_bluez-utils           = "bluez4"
-PREFERRED_PROVIDER_util-linux            = "util-linux-ng"
+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"
 
@@ -175,43 +137,19 @@ ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4
 
 ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
-
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
-#Silence a warning during parsing
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
 #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
 ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/angstrom${ARM_ABI}.inc
 
-
-
 # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 # 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" 
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
 
 # do some task-base stuff here
 
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/angstrom.inc b/conf/distro/include/angstrom.inc
index 6e65285e99..8647dd7ec4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}"
 
 TARGET_VENDOR = "-angstrom"
 
-# Add FEED_ARCH to overrides
-OVERRIDES .= ":${FEED_ARCH}"
+SOC_FAMILY ?= "Unknown"
+
+# Add FEED_ARCH and SOC_FAMILY to overrides
+OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}"
 
 # Put links to sources in deploy/sources to make it easier for people to be GPL compliant
 INHERIT += "src_distribute_local"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 5ec80ffeb1..204047fd63 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -36,22 +36,22 @@ PREFERRED_VERSION_binutils			?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross		?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross-sdk		?= "2.18.50.0.7"
 PREFERRED_VERSION_busybox			?= "1.13.2"
-PREFERRED_VERSION_dbus				?= "1.2.1"
+PREFERRED_VERSION_dbus				?= "1.2.3"
 PREFERRED_VERSION_gcc				?= "4.2.4"
 PREFERRED_VERSION_gcc-cross			?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-sdk			?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-initial		?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-intermediate	?= "4.2.4"
-PREFERRED_VERSION_glib-2.0			?= "2.18.3"
-PREFERRED_VERSION_glib-2.0-native		?= "2.18.0"
+PREFERRED_VERSION_glib-2.0			?= "2.22.1"
+PREFERRED_VERSION_glib-2.0-native		?= "2.22.1"
 PREFERRED_VERSION_glibc				?= "2.6.1"
 PREFERRED_VERSION_glibc-initial			?= "2.6.1"
 PREFERRED_VERSION_ipkg				?= "0.99.163"
 PREFERRED_VERSION_ipkg-native			?= "0.99.163"
-PREFERRED_VERSION_libtool			?= "2.2.4"
-PREFERRED_VERSION_libtool-native		?= "2.2.4"
-PREFERRED_VERSION_libtool-cross			?= "2.2.4"
-PREFERRED_VERSION_libtool-sdk			?= "2.2.4"
+PREFERRED_VERSION_libtool			?= "2.2.6a"
+PREFERRED_VERSION_libtool-native		?= "2.2.6a"
+PREFERRED_VERSION_libtool-cross			?= "2.2.6a"
+PREFERRED_VERSION_libtool-sdk			?= "2.2.6a"
 PREFERRED_VERSION_linux-libc-headers		?= "2.6.23"
 PREFERRED_VERSION_m4				?= "1.4.8"
 PREFERRED_VERSION_m4-native			?= "1.4.8"
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/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 96f3ddcde1..7d36ce6521 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -46,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "14"
+SRCREV_pn-e-tasks ?= "18"
 SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -66,7 +66,7 @@ SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-elmdentica ?= "171"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-enotes ?= "19"
-SRCREV_pn-epdfview ?= "345"
+SRCREV_pn-epdfview ?= "346"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-essential-dialer ?= "194"
 SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -107,18 +107,7 @@ SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
 SRCREV_pn-intone ?= "66"
@@ -196,7 +185,8 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "1096"
+SRCREV_pn-navit ?= "2846"
+SRCREV_pn-navit-icons ?= "2618"
 SRCREV_pn-neod ?= "4617"
 SRCREV_pn-neomis ?= "6"
 SRCREV_pn-net-snmp ?= "17367"
@@ -258,9 +248,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
-SRCREV_pn-opkg ?= "439"
-SRCREV_pn-opkg-native ?= "439"
-SRCREV_pn-opkg-sdk ?= "439"
+SRCREV_pn-opkg ?= "446"
+SRCREV_pn-opkg-native ?= "446"
+SRCREV_pn-opkg-sdk ?= "446"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
@@ -302,7 +292,7 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
-SRCREV_pn-shr-launcher ?= "87"
+SRCREV_pn-shr-launcher ?= "92"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-settings ?= "b92390148cf0e979fd4c678a6633bb5e436d5763"
 SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"
@@ -316,6 +306,7 @@ SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
+SRCREV_pn-shr-wizard ?= "35c1042d4547495033c04abb0c038f966a40e048"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-socketcan-utils-test ?= "917"
@@ -416,6 +407,9 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
 
+#illume default keyboards
+SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}"
+
 #exalt
 SRCREV_pn-exalt ?= "${EFL_SRCREV}"
 SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 122433b7fc..9449b87604 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -13,4 +13,5 @@ SRCREV_pn-libphone-ui = "${AUTOREV}"
 SRCREV_pn-libphone-ui-shr = "${AUTOREV}"
 SRCREV_pn-libphone-utils = "${AUTOREV}"
 SRCREV_pn-opimd-utils = "${AUTOREV}"
+SRCREV_pn-shr-wizard = "${AUTOREV}"
 
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8a331ae7f2..10a2bc4a02 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,6 +166,12 @@ PREFERRED_PROVIDER_avahi			?= "avahi"
 PREFERRED_PROVIDER_gconf			?= "gconf"
 PREFERRED_PROVIDER_virtual/libusb0		?= "libusb-compat"
 
+# we use bluez4 instead of the older bluez3
+DISTRO_BLUETOOTH_MANAGER			= "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus		= "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs			= "bluez4"
+PREFERRED_PROVIDER_bluez-utils			= "bluez4"
+
 # Include any package preferred versions and srcrevs:
 
 require conf/distro/include/preferred-slugos-versions.inc
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 25880dff9d..d9fc595303 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -72,12 +72,6 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\
 ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 #############################################################################
-# PREFERRED PROVIDERS
-#############################################################################
-PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
-PREFERRED_PROVIDER_virtual/libx11	= "libx11"
-PREFERRED_PROVIDER_virtual/gail         ?= "gtk+"
-#############################################################################
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 33eceab456..1e9eec20f4 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -84,20 +84,6 @@ LIBC ?= "eglibc"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################
-# PREFERRED PROVIDERS
-#############################################################################
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_PROVIDER_gtk+ = "gtk+"
-PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
-PREFERRED_PROVIDER_virtual/db = "db3"
-PREFERRED_PROVIDER_virtual/db-native = "db3-native"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
-
-#############################################################################
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 80f89bd5fe..b99c895dc2 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -30,6 +30,7 @@ DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
 DISTRO_SSH_DAEMON = "openssh"
+DISTRO_APM = "fso-apm"
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -155,35 +156,11 @@ require conf/distro/include/sane-toolchain.inc
 #############################################################################
 # PREFERRED PROVIDERS
 #############################################################################
-PREFERRED_PROVIDER_qemu-native = "qemu-native"
-PREFERRED_PROVIDER_gconf = "gconf"
-PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo"
-PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
 PREFERRED_PROVIDER_gpsd = "fso-gpsd"
-PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
-PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
-PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
-PREFERRED_PROVIDER_libfribidi = "fribidi"
-PREFERRED_PROVIDER_bluez-libs = "bluez4"
-PREFERRED_PROVIDER_bluez-utils = "bluez4"
-PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_PROVIDER_virtual/gail = "gtk+"
-PREFERRED_PROVIDER_opkg = "opkg"
-PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
 PREFERRED_PROVIDER_atd = "atd-over-fso"
-PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free"
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_gtk+ = "gtk+"
-PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
-PREFERRED_PROVIDER_virtual/db = "db3"
-PREFERRED_PROVIDER_virtual/db-native = "db3-native"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_opkg = "opkg"
 PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
-DISTRO_apm = "fso-apm"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
 
 #############################################################################
 # PREFERRED VERSIONS
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index d82be5d2b5..d9b00f41a8 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -12,7 +12,8 @@ DISTRO_TYPE = "alpha"
 TARGET_ARCH ?= "armeb"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-gnueabi"
-IPKG_VARIANT ?= "opkg-nogpg-nocurl"
+IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos"
 IMAGE_INITSCRIPTS ?= "initscripts-slugos"
 
 require conf/distro/include/slugos.inc