summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-06-17 21:07:35 +0000
committerJohn Bowler <jbowler@nslu2-linux.org>2005-06-17 21:07:35 +0000
commit5943ffb925bcca33466a5dcb0fb8a66ea5b4f3cc (patch)
tree0e854179f31d730dc955f1983f94f7fed9fe76a3 /conf
parentc4d83a7117266a4017afc7474d5bd846c0051a7a (diff)
Fix FEED_URIS and PREFERRED_PROVIDERS
BKrev: 42b33b97rppr5qK-aHoOfzhG3ExtuA
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug.conf14
1 files changed, 10 insertions, 4 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 0c69c844bc..3c8df27c8e 100644
--- 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"