sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
Richard Purdie 2007-08-21 10:40:55 +00:00
parent 48fd37f5f9
commit f041a4d9ab
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta/classes/base.bbclass
View File

@ -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 () {

1
meta/classes/multimachine.bbclass
View File

@ -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.

2
meta/conf/bitbake.conf
View File

@ -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}"