diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-08-21 10:40:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-21 10:40:55 +0000 |
| commit | f041a4d9ab55e5124d465742ea468e6ad55b412f (patch) | |
| tree | 3d5c033353d29ef6e54788c74e1db4da67ed99a7 | |
| parent | 48fd37f5f9f2907d2c6f5d547e8471b232eadc90 (diff) | |
| download | openembedded-core-f041a4d9ab55e5124d465742ea468e6ad55b412f.tar.gz openembedded-core-f041a4d9ab55e5124d465742ea468e6ad55b412f.tar.bz2 openembedded-core-f041a4d9ab55e5124d465742ea468e6ad55b412f.zip | |
base.bbclass: Set pkgdata location to something machine specific when needed so multimachine builds don't break.
NOTE: People will have to rerun the install/package tasks after this change on existing builds
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2527 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/base.bbclass | 10 | ||||
| -rw-r--r-- | meta/classes/multimachine.bbclass | 1 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4e6a22b2f8..2277877988 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -734,7 +734,7 @@ def explode_deps(s): def packaged(pkg, d): import os, bb - return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK) + return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK) def read_pkgdatafile(fn): pkgdata = {} @@ -760,23 +760,23 @@ def read_pkgdatafile(fn): def has_subpkgdata(pkg, d): import bb, os - fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d) + fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) return os.access(fn, os.R_OK) def read_subpkgdata(pkg, d): import bb, os - fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d) + fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) return read_pkgdatafile(fn) def has_pkgdata(pn, d): import bb, os - fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d) + fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) return os.access(fn, os.R_OK) def read_pkgdata(pn, d): import bb, os - fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d) + fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d) return read_pkgdatafile(fn) python read_subpackage_metadata () { diff --git a/meta/classes/multimachine.bbclass b/meta/classes/multimachine.bbclass index 4187a00ec3..7a2f24c963 100644 --- a/meta/classes/multimachine.bbclass +++ b/meta/classes/multimachine.bbclass @@ -1,6 +1,7 @@ STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" +PKGDATA_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/pkgdata" # Find any machine specific sub packages and if present, mark the # whole package as machine specific for multimachine purposes. diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 5398198547..83fd7f08d8 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -181,6 +181,8 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" +PKGDATA_DIR = "${STAGING_DIR}/pkgdata" + SDK_NAME = "${DISTRO}/${TARGET_ARCH}" SDK_PREFIX = "/usr/local/${SDK_NAME}" |