mirror of
https://git.yoctoproject.org/poky
synced 2026-05-05 07:39:49 +02:00
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:
@@ -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 () {
|
||||
|
||||
Reference in New Issue
Block a user