summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-01-07 23:15:28 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-07 23:15:28 +0000
commit57d37948ea19fcd860cd2f5577e828e126e00a77 (patch)
tree65a5aa25d515929998cf33fca753870396fe97a4 /conf
parent99ae9abc58d3e9ddbcca446101d0dace838c464d (diff)
parent5a0a3d0fc64b0de84790b76655cdbe01b938bce0 (diff)
merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
and 451d8c0761e16d84691a529f9f26a9989e138fc6
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf6
-rw-r--r--conf/local.conf.sample4
2 files changed, 8 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index bebad809d2..61c08758b2 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -67,6 +67,12 @@ TIME := "${@time.strftime('%H%M%S',time.gmtime())}"
DATETIME = "${DATE}${TIME}"
##################################################################
+# Openembedded Software Prerequisites.
+##################################################################
+
+ASSUME_PROVIDED = "python-native cvs-native svn-native"
+
+##################################################################
# Package default variables.
##################################################################
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 8515247d40..cbe829c2a1 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -34,11 +34,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"