Split the feeds into cross/native and ${DISTRO_VERSION}/unstable

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 33e655d..4661d91 100644 (file)
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -2,19 +2,20 @@
 #@NAME: OpenSlug
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
-# Add to the user's feeds from local.conf (there may be none)
-# not all available yet
-#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_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable"
-
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "2.2-beta"
 DISTRO_TYPE ?= "beta"
 
+# Add to the user's feeds from local.conf (there may be none)
+FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}"
+FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}"
+
+#
+# Uncomment the following to get the unstable feeds
+#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable"
+#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable"
+
+
 TARGET_FPU_local ?= "soft"
 TARGET_FPU := "${TARGET_FPU_local}"
 TARGET_OS_local ?= "linux"