Fix FEED_URIS and PREFERRED_PROVIDERS

BKrev: 42b33b97rppr5qK-aHoOfzhG3ExtuA

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 0c69c84..3c8df27 100644 (file)
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -4,12 +4,12 @@
 
 # Add to the user's feeds from local.conf (there may be none)
 # not all available yet
-#FEED_URIS += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross"
-#FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native"
-FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe"
+#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross"
+#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native"
+FEED_URIS_append_linux += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe"
 #
 # if you are very very brave:
-#FEED_URIS += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable"
+#FEED_URIS_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable"
 
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "1.13-beta"
@@ -84,6 +84,12 @@ kernel-module-nls-utf8 \
 
 OPENSLUG_EXTRA_INSTALL ?= "${OPENSLUG_EXTRA_RDEPENDS} ${OPENSLUG_EXTRA_FILESYSTEMS}"
 
+# Select the correct versions of the compiler tools (note that there
+# is also some selection in machine/nslu2.conf)
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
 # Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"