summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-21 10:40:55 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-21 10:40:55 +0000
commitf041a4d9ab55e5124d465742ea468e6ad55b412f (patch)
tree3d5c033353d29ef6e54788c74e1db4da67ed99a7
parent48fd37f5f9f2907d2c6f5d547e8471b232eadc90 (diff)
downloadpoky-f041a4d9ab55e5124d465742ea468e6ad55b412f.tar.gz
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.bbclass10
-rw-r--r--meta/classes/multimachine.bbclass1
-rw-r--r--meta/conf/bitbake.conf2
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):
734 734
735def packaged(pkg, d): 735def packaged(pkg, d):
736 import os, bb 736 import os, bb
737 return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK) 737 return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
738 738
739def read_pkgdatafile(fn): 739def read_pkgdatafile(fn):
740 pkgdata = {} 740 pkgdata = {}
@@ -760,23 +760,23 @@ def read_pkgdatafile(fn):
760 760
761def has_subpkgdata(pkg, d): 761def has_subpkgdata(pkg, d):
762 import bb, os 762 import bb, os
763 fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d) 763 fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
764 return os.access(fn, os.R_OK) 764 return os.access(fn, os.R_OK)
765 765
766def read_subpkgdata(pkg, d): 766def read_subpkgdata(pkg, d):
767 import bb, os 767 import bb, os
768 fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d) 768 fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
769 return read_pkgdatafile(fn) 769 return read_pkgdatafile(fn)
770 770
771 771
772def has_pkgdata(pn, d): 772def has_pkgdata(pn, d):
773 import bb, os 773 import bb, os
774 fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d) 774 fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
775 return os.access(fn, os.R_OK) 775 return os.access(fn, os.R_OK)
776 776
777def read_pkgdata(pn, d): 777def read_pkgdata(pn, d):
778 import bb, os 778 import bb, os
779 fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d) 779 fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
780 return read_pkgdatafile(fn) 780 return read_pkgdatafile(fn)
781 781
782python read_subpackage_metadata () { 782python 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 @@
1STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" 1STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
2WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" 2WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
3STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" 3STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
4PKGDATA_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/pkgdata"
4 5
5# Find any machine specific sub packages and if present, mark the 6# Find any machine specific sub packages and if present, mark the
6# whole package as machine specific for multimachine purposes. 7# 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"
181DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" 181DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
182DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" 182DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
183 183
184PKGDATA_DIR = "${STAGING_DIR}/pkgdata"
185
184SDK_NAME = "${DISTRO}/${TARGET_ARCH}" 186SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
185SDK_PREFIX = "/usr/local/${SDK_NAME}" 187SDK_PREFIX = "/usr/local/${SDK_NAME}"
186 188