diff options
author | Koen Kooi <koen@openembedded.org> | 2006-10-20 12:30:29 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2006-10-20 12:30:29 +0000 |
commit | 0a77cd9448bc221c366fc4a2cf0a93addb50e21d (patch) | |
tree | 2c7866bf4a2a4d3c4641ea962dc60167e832c032 | |
parent | bd1ecc5eecfb2ab5f8e6c5686cfbd60c023194af (diff) | |
parent | 1e671c11a8b6f140e11b9cb38c3728cce90f0665 (diff) |
merge of '365d8f133c3f7699978ee00c41919fac8d53bd47'
and '8ce31384f7196aabf3284f45ea6f9fc66d2c49ba'
-rw-r--r-- | classes/base.bbclass | 5 | ||||
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 6 | ||||
-rw-r--r-- | conf/distro/openzaurus-unstable.conf | 3 | ||||
-rw-r--r-- | conf/local.conf.sample | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 4aaee3686c..0e864457ab 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -791,10 +791,5 @@ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ - - - -ftp://.*/.*/ http://www.oesources.org/source/current/ -http://.*/.*/ http://www.oesources.org/source/current/ } diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 1cae849d0c..92ec149b55 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,9 +6,9 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2006.9" +#DISTRO_VERSION = "2007.1" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "2" +DISTRO_REVISION = "3" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -42,7 +42,7 @@ PREFERRED_VERSION_qemu-native = "0.8.2" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -http://www.oesources.org/source/current/" +" # Opie #use 1337 mt version of opie to have a webbrowser diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 6dbf0dc31f..b1080d1fea 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -8,8 +8,7 @@ DISTRO_VERSION = ".dev-snapshot-${DATE}" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -http://www.oesources.org/source/current/" - +" require conf/distro/include/sane-srcdates.inc require conf/distro/include/openzaurus.inc diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 9d23b654cf..0f098c3272 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -133,7 +133,7 @@ BBINCLUDELOGS = "yes" # Specifies a location to search for pre-generated tarballs when fetching # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. -CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" +#CVS_TARBALL_STASH = "" # EDIT THIS FILE and then remove the line below before using! REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" |