mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 15:32:12 +02:00
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Lock
committed by
Richard Purdie
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -11,7 +11,7 @@ def generate_sstatefn(spec, hash, d):
|
||||
SSTATE_PKGARCH = "${PACKAGE_ARCH}"
|
||||
SSTATE_PKGSPEC = "sstate:${PN}:${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}:${PV}:${PR}:${SSTATE_PKGARCH}:${SSTATE_VERSION}:"
|
||||
SSTATE_SWSPEC = "sstate:${PN}::${PV}:${PR}::${SSTATE_VERSION}:"
|
||||
SSTATE_PKGNAME = "${SSTATE_EXTRAPATH}${@generate_sstatefn(d.getVar('SSTATE_PKGSPEC', True), d.getVar('BB_TASKHASH', True), d)}"
|
||||
SSTATE_PKGNAME = "${SSTATE_EXTRAPATH}${@generate_sstatefn(d.getVar('SSTATE_PKGSPEC'), d.getVar('BB_TASKHASH'), d)}"
|
||||
SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
|
||||
SSTATE_EXTRAPATH = ""
|
||||
SSTATE_EXTRAPATHWILDCARD = ""
|
||||
@@ -34,7 +34,7 @@ SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}"
|
||||
SSTATE_DUPWHITELIST += "${DEPLOY_DIR}/sdk/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt"
|
||||
|
||||
SSTATE_SCAN_FILES ?= "*.la *-config *_config"
|
||||
SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f'
|
||||
SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f'
|
||||
|
||||
BB_HASHFILENAME = "False ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}"
|
||||
|
||||
@@ -84,7 +84,7 @@ python () {
|
||||
d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
|
||||
elif bb.data.inherits_class('cross-canadian', d):
|
||||
d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}"))
|
||||
elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH", True) == "all":
|
||||
elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH") == "all":
|
||||
d.setVar('SSTATE_PKGARCH', "allarch")
|
||||
else:
|
||||
d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
|
||||
@@ -100,7 +100,7 @@ python () {
|
||||
scan_cmd = "grep -Irl ${STAGING_DIR} ${SSTATE_BUILDDIR}"
|
||||
d.setVar('SSTATE_SCAN_CMD', scan_cmd)
|
||||
|
||||
unique_tasks = sorted(set((d.getVar('SSTATETASKS', True) or "").split()))
|
||||
unique_tasks = sorted(set((d.getVar('SSTATETASKS') or "").split()))
|
||||
d.setVar('SSTATETASKS', " ".join(unique_tasks))
|
||||
for task in unique_tasks:
|
||||
d.prependVarFlag(task, 'prefuncs', "sstate_task_prefunc ")
|
||||
@@ -118,7 +118,7 @@ def sstate_init(task, d):
|
||||
|
||||
def sstate_state_fromvars(d, task = None):
|
||||
if task is None:
|
||||
task = d.getVar('BB_CURRENTTASK', True)
|
||||
task = d.getVar('BB_CURRENTTASK')
|
||||
if not task:
|
||||
bb.fatal("sstate code running without task context?!")
|
||||
task = task.replace("_setscene", "")
|
||||
@@ -200,7 +200,7 @@ def sstate_install(ss, d):
|
||||
shareddirs.append(dstdir)
|
||||
|
||||
# Check the file list for conflicts against files which already exist
|
||||
whitelist = (d.getVar("SSTATE_DUPWHITELIST", True) or "").split()
|
||||
whitelist = (d.getVar("SSTATE_DUPWHITELIST") or "").split()
|
||||
match = []
|
||||
for f in sharedfiles:
|
||||
if os.path.exists(f):
|
||||
@@ -239,7 +239,7 @@ def sstate_install(ss, d):
|
||||
"things (e.g. bluez 4 and bluez 5 and the correct solution for that would " \
|
||||
"be to resolve the conflict. If in doubt, please ask on the mailing list, " \
|
||||
"sharing the error and filelist above." % \
|
||||
(d.getVar('PN', True), "\n ".join(match)))
|
||||
(d.getVar('PN'), "\n ".join(match)))
|
||||
bb.fatal("If the above message is too much, the simpler version is you're advised to wipe out tmp and rebuild (reusing sstate is fine). That will likely fix things in most (but not all) cases.")
|
||||
|
||||
# Write out the manifest
|
||||
@@ -260,7 +260,7 @@ def sstate_install(ss, d):
|
||||
|
||||
i = d2.expand("${SSTATE_MANIFESTS}/index-${SSTATE_MANMACH}")
|
||||
l = bb.utils.lockfile(i + ".lock")
|
||||
filedata = d.getVar("STAMP", True) + " " + d2.getVar("SSTATE_MANFILEPREFIX", True) + " " + d.getVar("WORKDIR", True) + "\n"
|
||||
filedata = d.getVar("STAMP") + " " + d2.getVar("SSTATE_MANFILEPREFIX") + " " + d.getVar("WORKDIR") + "\n"
|
||||
manifests = []
|
||||
if os.path.exists(i):
|
||||
with open(i, "r") as f:
|
||||
@@ -275,7 +275,7 @@ def sstate_install(ss, d):
|
||||
if os.path.exists(state[1]):
|
||||
oe.path.copyhardlinktree(state[1], state[2])
|
||||
|
||||
for postinst in (d.getVar('SSTATEPOSTINSTFUNCS', True) or '').split():
|
||||
for postinst in (d.getVar('SSTATEPOSTINSTFUNCS') or '').split():
|
||||
# All hooks should run in the SSTATE_INSTDIR
|
||||
bb.build.exec_func(postinst, d, (sstateinst,))
|
||||
|
||||
@@ -298,8 +298,8 @@ def sstate_installpkg(ss, d):
|
||||
oe.path.remove(dir)
|
||||
|
||||
sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['task'])
|
||||
sstatefetch = d.getVar('SSTATE_PKGNAME', True) + '_' + ss['task'] + ".tgz"
|
||||
sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['task'] + ".tgz"
|
||||
sstatefetch = d.getVar('SSTATE_PKGNAME') + '_' + ss['task'] + ".tgz"
|
||||
sstatepkg = d.getVar('SSTATE_PKG') + '_' + ss['task'] + ".tgz"
|
||||
|
||||
if not os.path.exists(sstatepkg):
|
||||
pstaging_fetch(sstatefetch, sstatepkg, d)
|
||||
@@ -313,12 +313,12 @@ def sstate_installpkg(ss, d):
|
||||
d.setVar('SSTATE_INSTDIR', sstateinst)
|
||||
d.setVar('SSTATE_PKG', sstatepkg)
|
||||
|
||||
if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False):
|
||||
if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False):
|
||||
signer = get_signer(d, 'local')
|
||||
if not signer.verify(sstatepkg + '.sig'):
|
||||
bb.warn("Cannot verify signature on sstate package %s" % sstatepkg)
|
||||
|
||||
for f in (d.getVar('SSTATEPREINSTFUNCS', True) or '').split() + ['sstate_unpack_package'] + (d.getVar('SSTATEPOSTUNPACKFUNCS', True) or '').split():
|
||||
for f in (d.getVar('SSTATEPREINSTFUNCS') or '').split() + ['sstate_unpack_package'] + (d.getVar('SSTATEPOSTUNPACKFUNCS') or '').split():
|
||||
# All hooks should run in the SSTATE_INSTDIR
|
||||
bb.build.exec_func(f, d, (sstateinst,))
|
||||
|
||||
@@ -328,7 +328,7 @@ def sstate_installpkg(ss, d):
|
||||
sstate_install(ss, d)
|
||||
|
||||
for plain in ss['plaindirs']:
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
workdir = d.getVar('WORKDIR')
|
||||
src = sstateinst + "/" + plain.replace(workdir, '')
|
||||
dest = plain
|
||||
bb.utils.mkdirhier(src)
|
||||
@@ -344,12 +344,12 @@ python sstate_hardcode_path_unpack () {
|
||||
# sstate_hardcode_path(d)
|
||||
import subprocess
|
||||
|
||||
sstateinst = d.getVar('SSTATE_INSTDIR', True)
|
||||
sstateinst = d.getVar('SSTATE_INSTDIR')
|
||||
fixmefn = sstateinst + "fixmepath"
|
||||
if os.path.isfile(fixmefn):
|
||||
staging = d.getVar('STAGING_DIR', True)
|
||||
staging_target = d.getVar('STAGING_DIR_TARGET', True)
|
||||
staging_host = d.getVar('STAGING_DIR_HOST', True)
|
||||
staging = d.getVar('STAGING_DIR')
|
||||
staging_target = d.getVar('STAGING_DIR_TARGET')
|
||||
staging_host = d.getVar('STAGING_DIR_HOST')
|
||||
|
||||
if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross-canadian', d):
|
||||
sstate_sed_cmd = "sed -i -e 's:FIXMESTAGINGDIR:%s:g'" % (staging)
|
||||
@@ -358,9 +358,9 @@ python sstate_hardcode_path_unpack () {
|
||||
else:
|
||||
sstate_sed_cmd = "sed -i -e 's:FIXMESTAGINGDIRHOST:%s:g'" % (staging_host)
|
||||
|
||||
extra_staging_fixmes = d.getVar('EXTRA_STAGING_FIXMES', True) or ''
|
||||
extra_staging_fixmes = d.getVar('EXTRA_STAGING_FIXMES') or ''
|
||||
for fixmevar in extra_staging_fixmes.split():
|
||||
fixme_path = d.getVar(fixmevar, True)
|
||||
fixme_path = d.getVar(fixmevar)
|
||||
sstate_sed_cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path)
|
||||
|
||||
# Add sstateinst to each filename in fixmepath, use xargs to efficiently call sed
|
||||
@@ -377,12 +377,12 @@ python sstate_hardcode_path_unpack () {
|
||||
def sstate_clean_cachefile(ss, d):
|
||||
import oe.path
|
||||
|
||||
sstatepkgfile = d.getVar('SSTATE_PATHSPEC', True) + "*_" + ss['task'] + ".tgz*"
|
||||
sstatepkgfile = d.getVar('SSTATE_PATHSPEC') + "*_" + ss['task'] + ".tgz*"
|
||||
bb.note("Removing %s" % sstatepkgfile)
|
||||
oe.path.remove(sstatepkgfile)
|
||||
|
||||
def sstate_clean_cachefiles(d):
|
||||
for task in (d.getVar('SSTATETASKS', True) or "").split():
|
||||
for task in (d.getVar('SSTATETASKS') or "").split():
|
||||
ld = d.createCopy()
|
||||
ss = sstate_state_fromvars(ld, task)
|
||||
sstate_clean_cachefile(ss, ld)
|
||||
@@ -424,7 +424,7 @@ def sstate_clean(ss, d):
|
||||
import glob
|
||||
|
||||
d2 = d.createCopy()
|
||||
stamp_clean = d.getVar("STAMPCLEAN", True)
|
||||
stamp_clean = d.getVar("STAMPCLEAN")
|
||||
extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True)
|
||||
if extrainf:
|
||||
d2.setVar("SSTATE_MANMACH", extrainf)
|
||||
@@ -467,7 +467,7 @@ def sstate_clean(ss, d):
|
||||
oe.path.remove(stfile)
|
||||
|
||||
# Removes the users/groups created by the package
|
||||
for cleanfunc in (d.getVar('SSTATECLEANFUNCS', True) or '').split():
|
||||
for cleanfunc in (d.getVar('SSTATECLEANFUNCS') or '').split():
|
||||
bb.build.exec_func(cleanfunc, d)
|
||||
|
||||
sstate_clean[vardepsexclude] = "SSTATE_MANFILEPREFIX"
|
||||
@@ -475,13 +475,13 @@ sstate_clean[vardepsexclude] = "SSTATE_MANFILEPREFIX"
|
||||
CLEANFUNCS += "sstate_cleanall"
|
||||
|
||||
python sstate_cleanall() {
|
||||
bb.note("Removing shared state for package %s" % d.getVar('PN', True))
|
||||
bb.note("Removing shared state for package %s" % d.getVar('PN'))
|
||||
|
||||
manifest_dir = d.getVar('SSTATE_MANIFESTS', True)
|
||||
manifest_dir = d.getVar('SSTATE_MANIFESTS')
|
||||
if not os.path.exists(manifest_dir):
|
||||
return
|
||||
|
||||
tasks = d.getVar('SSTATETASKS', True).split()
|
||||
tasks = d.getVar('SSTATETASKS').split()
|
||||
for name in tasks:
|
||||
ld = d.createCopy()
|
||||
shared_state = sstate_state_fromvars(ld, name)
|
||||
@@ -497,10 +497,10 @@ python sstate_hardcode_path () {
|
||||
# Note: the logic in this function needs to match the reverse logic
|
||||
# in sstate_installpkg(ss, d)
|
||||
|
||||
staging = d.getVar('STAGING_DIR', True)
|
||||
staging_target = d.getVar('STAGING_DIR_TARGET', True)
|
||||
staging_host = d.getVar('STAGING_DIR_HOST', True)
|
||||
sstate_builddir = d.getVar('SSTATE_BUILDDIR', True)
|
||||
staging = d.getVar('STAGING_DIR')
|
||||
staging_target = d.getVar('STAGING_DIR_TARGET')
|
||||
staging_host = d.getVar('STAGING_DIR_HOST')
|
||||
sstate_builddir = d.getVar('SSTATE_BUILDDIR')
|
||||
|
||||
if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross-canadian', d):
|
||||
sstate_grep_cmd = "grep -l -e '%s'" % (staging)
|
||||
@@ -512,14 +512,14 @@ python sstate_hardcode_path () {
|
||||
sstate_grep_cmd = "grep -l -e '%s'" % (staging_host)
|
||||
sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRHOST:g'" % (staging_host)
|
||||
|
||||
extra_staging_fixmes = d.getVar('EXTRA_STAGING_FIXMES', True) or ''
|
||||
extra_staging_fixmes = d.getVar('EXTRA_STAGING_FIXMES') or ''
|
||||
for fixmevar in extra_staging_fixmes.split():
|
||||
fixme_path = d.getVar(fixmevar, True)
|
||||
fixme_path = d.getVar(fixmevar)
|
||||
sstate_sed_cmd += " -e 's:%s:FIXME_%s:g'" % (fixme_path, fixmevar)
|
||||
|
||||
fixmefn = sstate_builddir + "fixmepath"
|
||||
|
||||
sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True)
|
||||
sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD')
|
||||
sstate_filelist_cmd = "tee %s" % (fixmefn)
|
||||
|
||||
# fixmepath file needs relative paths, drop sstate_builddir prefix
|
||||
@@ -568,17 +568,17 @@ def sstate_package(ss, d):
|
||||
os.remove(path)
|
||||
os.symlink(base, path)
|
||||
|
||||
tmpdir = d.getVar('TMPDIR', True)
|
||||
tmpdir = d.getVar('TMPDIR')
|
||||
|
||||
sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task'])
|
||||
sstatepkg = d.getVar('SSTATE_PKG', True) + '_'+ ss['task'] + ".tgz"
|
||||
sstatepkg = d.getVar('SSTATE_PKG') + '_'+ ss['task'] + ".tgz"
|
||||
bb.utils.remove(sstatebuild, recurse=True)
|
||||
bb.utils.mkdirhier(sstatebuild)
|
||||
bb.utils.mkdirhier(os.path.dirname(sstatepkg))
|
||||
for state in ss['dirs']:
|
||||
if not os.path.exists(state[1]):
|
||||
continue
|
||||
if d.getVar('SSTATE_SKIP_CREATION', True) == '1':
|
||||
if d.getVar('SSTATE_SKIP_CREATION') == '1':
|
||||
continue
|
||||
srcbase = state[0].rstrip("/").rsplit('/', 1)[0]
|
||||
for walkroot, dirs, files in os.walk(state[1]):
|
||||
@@ -593,7 +593,7 @@ def sstate_package(ss, d):
|
||||
bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], sstatebuild + state[0]))
|
||||
oe.path.copyhardlinktree(state[1], sstatebuild + state[0])
|
||||
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
workdir = d.getVar('WORKDIR')
|
||||
for plain in ss['plaindirs']:
|
||||
pdir = plain.replace(workdir, sstatebuild)
|
||||
bb.utils.mkdirhier(plain)
|
||||
@@ -603,9 +603,9 @@ def sstate_package(ss, d):
|
||||
d.setVar('SSTATE_BUILDDIR', sstatebuild)
|
||||
d.setVar('SSTATE_PKG', sstatepkg)
|
||||
|
||||
for f in (d.getVar('SSTATECREATEFUNCS', True) or '').split() + \
|
||||
for f in (d.getVar('SSTATECREATEFUNCS') or '').split() + \
|
||||
['sstate_create_package', 'sstate_sign_package'] + \
|
||||
(d.getVar('SSTATEPOSTCREATEFUNCS', True) or '').split():
|
||||
(d.getVar('SSTATEPOSTCREATEFUNCS') or '').split():
|
||||
# All hooks should run in SSTATE_BUILDDIR.
|
||||
bb.build.exec_func(f, d, (sstatebuild,))
|
||||
|
||||
@@ -617,7 +617,7 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
|
||||
import bb.fetch2
|
||||
|
||||
# Only try and fetch if the user has configured a mirror
|
||||
mirrors = d.getVar('SSTATE_MIRRORS', True)
|
||||
mirrors = d.getVar('SSTATE_MIRRORS')
|
||||
if not mirrors:
|
||||
return
|
||||
|
||||
@@ -635,14 +635,14 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
|
||||
|
||||
# if BB_NO_NETWORK is set but we also have SSTATE_MIRROR_ALLOW_NETWORK,
|
||||
# we'll want to allow network access for the current set of fetches.
|
||||
if localdata.getVar('BB_NO_NETWORK', True) == "1" and localdata.getVar('SSTATE_MIRROR_ALLOW_NETWORK', True) == "1":
|
||||
if localdata.getVar('BB_NO_NETWORK') == "1" and localdata.getVar('SSTATE_MIRROR_ALLOW_NETWORK') == "1":
|
||||
localdata.delVar('BB_NO_NETWORK')
|
||||
|
||||
# Try a fetch from the sstate mirror, if it fails just return and
|
||||
# we will build the package
|
||||
uris = ['file://{0};downloadfilename={0}'.format(sstatefetch),
|
||||
'file://{0}.siginfo;downloadfilename={0}.siginfo'.format(sstatefetch)]
|
||||
if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False):
|
||||
if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False):
|
||||
uris += ['file://{0}.sig;downloadfilename={0}.sig'.format(sstatefetch)]
|
||||
|
||||
for srcuri in uris:
|
||||
@@ -671,7 +671,7 @@ python sstate_task_postfunc () {
|
||||
|
||||
sstate_install(shared_state, d)
|
||||
for intercept in shared_state['interceptfuncs']:
|
||||
bb.build.exec_func(intercept, d, (d.getVar("WORKDIR", True),))
|
||||
bb.build.exec_func(intercept, d, (d.getVar("WORKDIR"),))
|
||||
omask = os.umask(0o002)
|
||||
if omask != 0o002:
|
||||
bb.note("Using umask 0o002 (not %0o) for sstate packaging" % omask)
|
||||
@@ -709,13 +709,13 @@ sstate_create_package () {
|
||||
python sstate_sign_package () {
|
||||
from oe.gpg_sign import get_signer
|
||||
|
||||
if d.getVar('SSTATE_SIG_KEY', True):
|
||||
if d.getVar('SSTATE_SIG_KEY'):
|
||||
signer = get_signer(d, 'local')
|
||||
sstate_pkg = d.getVar('SSTATE_PKG', True)
|
||||
sstate_pkg = d.getVar('SSTATE_PKG')
|
||||
if os.path.exists(sstate_pkg + '.sig'):
|
||||
os.unlink(sstate_pkg + '.sig')
|
||||
signer.detach_sign(sstate_pkg, d.getVar('SSTATE_SIG_KEY', False), None,
|
||||
d.getVar('SSTATE_SIG_PASSPHRASE', True), armor=False)
|
||||
d.getVar('SSTATE_SIG_PASSPHRASE'), armor=False)
|
||||
}
|
||||
|
||||
#
|
||||
@@ -746,7 +746,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False):
|
||||
splithashfn = sq_hashfn[task].split(" ")
|
||||
spec = splithashfn[1]
|
||||
if splithashfn[0] == "True":
|
||||
extrapath = d.getVar("NATIVELSBSTRING", True) + "/"
|
||||
extrapath = d.getVar("NATIVELSBSTRING") + "/"
|
||||
else:
|
||||
extrapath = ""
|
||||
|
||||
@@ -785,7 +785,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False):
|
||||
missed.append(task)
|
||||
bb.debug(2, "SState: Looked for but didn't find file %s" % sstatefile)
|
||||
|
||||
mirrors = d.getVar("SSTATE_MIRRORS", True)
|
||||
mirrors = d.getVar("SSTATE_MIRRORS")
|
||||
if mirrors:
|
||||
# Copy the data object and override DL_DIR and SRC_URI
|
||||
localdata = bb.data.createCopy(d)
|
||||
@@ -801,7 +801,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False):
|
||||
|
||||
# if BB_NO_NETWORK is set but we also have SSTATE_MIRROR_ALLOW_NETWORK,
|
||||
# we'll want to allow network access for the current set of fetches.
|
||||
if localdata.getVar('BB_NO_NETWORK', True) == "1" and localdata.getVar('SSTATE_MIRROR_ALLOW_NETWORK', True) == "1":
|
||||
if localdata.getVar('BB_NO_NETWORK') == "1" and localdata.getVar('SSTATE_MIRROR_ALLOW_NETWORK') == "1":
|
||||
localdata.delVar('BB_NO_NETWORK')
|
||||
|
||||
whitelist = bb.runqueue.get_setscene_enforce_whitelist(d)
|
||||
@@ -868,7 +868,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False):
|
||||
if whitelist and missing:
|
||||
bb.fatal('Required artifacts were unavailable - exiting')
|
||||
|
||||
inheritlist = d.getVar("INHERIT", True)
|
||||
inheritlist = d.getVar("INHERIT")
|
||||
if "toaster" in inheritlist:
|
||||
evdata = {'missed': [], 'found': []};
|
||||
for task in missed:
|
||||
@@ -977,15 +977,15 @@ sstate_eventhandler[eventmask] = "bb.build.TaskSucceeded"
|
||||
python sstate_eventhandler() {
|
||||
d = e.data
|
||||
# When we write an sstate package we rewrite the SSTATE_PKG
|
||||
spkg = d.getVar('SSTATE_PKG', True)
|
||||
spkg = d.getVar('SSTATE_PKG')
|
||||
if not spkg.endswith(".tgz"):
|
||||
taskname = d.getVar("BB_RUNTASK", True)[3:]
|
||||
spec = d.getVar('SSTATE_PKGSPEC', True)
|
||||
swspec = d.getVar('SSTATE_SWSPEC', True)
|
||||
taskname = d.getVar("BB_RUNTASK")[3:]
|
||||
spec = d.getVar('SSTATE_PKGSPEC')
|
||||
swspec = d.getVar('SSTATE_SWSPEC')
|
||||
if taskname in ["fetch", "unpack", "patch", "populate_lic", "preconfigure"] and swspec:
|
||||
d.setVar("SSTATE_PKGSPEC", "${SSTATE_SWSPEC}")
|
||||
d.setVar("SSTATE_EXTRAPATH", "")
|
||||
sstatepkg = d.getVar('SSTATE_PKG', True)
|
||||
sstatepkg = d.getVar('SSTATE_PKG')
|
||||
bb.siggen.dump_this_task(sstatepkg + '_' + taskname + ".tgz" ".siginfo", d)
|
||||
}
|
||||
|
||||
@@ -1004,7 +1004,7 @@ python sstate_eventhandler2() {
|
||||
stamps = e.stamps.values()
|
||||
removeworkdir = (d.getVar("SSTATE_PRUNE_OBSOLETEWORKDIR", False) == "1")
|
||||
seen = []
|
||||
for a in d.getVar("SSTATE_ARCHS", True).split():
|
||||
for a in d.getVar("SSTATE_ARCHS").split():
|
||||
toremove = []
|
||||
i = d.expand("${SSTATE_MANIFESTS}/index-" + a)
|
||||
if not os.path.exists(i):
|
||||
|
||||
Reference in New Issue
Block a user