Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/07 10:28:16+01:00 (none)!br1
set default nylon release to unstable

BKrev: 41de58f8BndhMvlmybm0HZWDeSrk2A

diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 6ba3af7..77d14dc 100644 (file)
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -34,6 +34,9 @@ PREFERRED_VERSION_olsrd = "0.4.8"
 PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
 PREFERRED_VERSION_usbutils = "0.11"
 
+# usually overrrided from local.conf
+NYLON_RELEASE = "unstable"
+
 # use meshcub.org mirrors
 CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/"
 INHERIT += "nylon-mirrors"