From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Fri, 7 Jan 2005 09:40:08 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15451
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d413ba2490fc37d2fe7b09f42d412157afd12083;p=openembedded.git

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 6ba3af746e..77d14dc518 100644
--- 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"