summaryrefslogtreecommitdiff
path: root/openembedded/conf/local.conf.sample
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-02-10 11:45:39 +0000
committerRichard Purdie <richard@openedhand.com>2006-02-10 11:45:39 +0000
commitdd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42 (patch)
treee8b9838dc2981038046081efe5145a4227902f7d /openembedded/conf/local.conf.sample
parentce241d7e6d8e31411867b5f2127b02c776b39d8a (diff)
downloadopenembedded-core-dd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42.tar.gz
openembedded-core-dd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42.tar.bz2
openembedded-core-dd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42.tar.xz
openembedded-core-dd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42.zip
Pull conf file updates from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@270 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/local.conf.sample')
-rw-r--r--openembedded/conf/local.conf.sample6
1 files changed, 3 insertions, 3 deletions
diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample
index 49b66b2e5..70abc9892 100644
--- a/openembedded/conf/local.conf.sample
+++ b/openembedded/conf/local.conf.sample
@@ -40,11 +40,11 @@ BBMASK = ""
# provide packages for toolchain and additional libraries yourself. You also
# have to set PATH in your environment to make sure BitBake finds additional binaries.
# Note: You will definitely need to say:
-# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
# to build any of two Linux 2.4 Embedix kernels,
# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
# to rename the binaries as instructed in the Wiki.
-# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
+# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
# Select between multiple alternative providers, if more than one is eligible.
PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
@@ -78,7 +78,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# Uncomment this to select a distribution policy. See the conf directory
# for distributions currently known to OpenEmbedded.
# Stay away from unversioned distros unless you really know what you are doing
-# DISTRO = "familiar-0.8.3"
+# DISTRO = "familiar-unstable"
# Uncomment this to select a particular kernel version if supported by
# your MACHINE setting. Currently only supported on Zaurus Clamshells.