diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-01-07 23:15:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-07 23:15:28 +0000 |
| commit | 57d37948ea19fcd860cd2f5577e828e126e00a77 (patch) | |
| tree | 65a5aa25d515929998cf33fca753870396fe97a4 | |
| parent | 99ae9abc58d3e9ddbcca446101d0dace838c464d (diff) | |
| parent | 5a0a3d0fc64b0de84790b76655cdbe01b938bce0 (diff) | |
merge of 2057bca5a2cf515271e6a43d7432ecd028f5dca5
and 451d8c0761e16d84691a529f9f26a9989e138fc6
| -rw-r--r-- | classes/image_ipk.bbclass | 3 | ||||
| -rw-r--r-- | conf/bitbake.conf | 6 | ||||
| -rw-r--r-- | conf/local.conf.sample | 4 | ||||
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb | 4 | ||||
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils_1.6cvs.bb | 1 |
5 files changed, 14 insertions, 4 deletions
diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index 5fdd340673..f6af799e69 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -1,5 +1,8 @@ inherit rootfs_ipk +# We need to follow RDEPENDS and RRECOMMENDS for images +BUILD_ALL_DEPS = "1" + # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" 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" diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb index 2506dbab62..cd24007f02 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb @@ -2,7 +2,9 @@ SECTION = "base" include ipkg-utils_${PV}.bb PR = "r4" inherit native -DEPENDS = "" +RDEPENDS = "python-native" +# Avoid circular dependencies from package_ipk.bbclass +PACKAGES = "" do_stage() { for i in ${INSTALL}; do diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb index 059ce8cb58..e315c82264 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb @@ -1,5 +1,4 @@ DESCRIPTION = "Itsy Package Manager utilities" -DEPENDS = "" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" |