diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-03-23 22:30:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-03-23 22:30:35 +0000 |
| commit | b3f42b759915ee078b192c43b37a86a219d15ebf (patch) | |
| tree | 4378dddb69c532781870fc683f24a498e7fb52d3 /openembedded/conf/bitbake.conf | |
| parent | f7f54600f1ce3763705c6c6337bea052f77c5e33 (diff) | |
| download | openembedded-core-b3f42b759915ee078b192c43b37a86a219d15ebf.tar.gz openembedded-core-b3f42b759915ee078b192c43b37a86a219d15ebf.tar.bz2 openembedded-core-b3f42b759915ee078b192c43b37a86a219d15ebf.zip | |
Sync conf files with OE - includes adding zaurusd to images and fixing PCMCIA_MANAGER handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@327 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/bitbake.conf')
| -rw-r--r-- | openembedded/conf/bitbake.conf | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf index 9d8ce784b3..3b642e58f7 100644 --- a/openembedded/conf/bitbake.conf +++ b/openembedded/conf/bitbake.conf @@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime" +ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native" ################################################################## # Package default variables. @@ -298,7 +298,7 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" -GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source" +GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" @@ -306,6 +306,7 @@ FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" +APACHE_MIRROR = "http://www.apache.org/dist" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" @@ -394,3 +395,9 @@ include conf/machine/${MACHINE}.conf include conf/distro/${DISTRO}.conf include conf/documentation.conf require conf/sanity.conf + +################################################################## +# Weak variables (usually to retain backwards compatibility) +################################################################## + +PCMCIA_MANAGER ?= "pcmcia-cs"
\ No newline at end of file |