|
@@ -24,16 +24,16 @@ python () {
|
|
|
if bb.data.inherits_class('native', d):
|
|
|
d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'))
|
|
|
elif bb.data.inherits_class('cross', d):
|
|
|
- d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TUNE_PKGARCH}", d))
|
|
|
- d.setVar('SSTATE_MANMACH', bb.data.expand("${BUILD_ARCH}_${MACHINE}", d))
|
|
|
+ d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TUNE_PKGARCH}"))
|
|
|
+ d.setVar('SSTATE_MANMACH', d.expand("${BUILD_ARCH}_${MACHINE}"))
|
|
|
elif bb.data.inherits_class('crosssdk', d):
|
|
|
- d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${PACKAGE_ARCH}", d))
|
|
|
+ d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${PACKAGE_ARCH}"))
|
|
|
elif bb.data.inherits_class('nativesdk', d):
|
|
|
- d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}", d))
|
|
|
+ d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}"))
|
|
|
elif bb.data.inherits_class('cross-canadian', d):
|
|
|
- d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}_${PACKAGE_ARCH}", d))
|
|
|
+ d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}"))
|
|
|
else:
|
|
|
- d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d))
|
|
|
+ d.setVar('SSTATE_MANMACH', d.expand("${MACHINE}"))
|
|
|
|
|
|
# These classes encode staging paths into their scripts data so can only be
|
|
|
# reused if we manipulate the paths
|
|
@@ -97,8 +97,8 @@ def sstate_install(ss, d):
|
|
|
|
|
|
sharedfiles = []
|
|
|
shareddirs = []
|
|
|
- bb.mkdirhier(bb.data.expand("${SSTATE_MANIFESTS}", d))
|
|
|
- manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d)
|
|
|
+ bb.mkdirhier(d.expand("${SSTATE_MANIFESTS}"))
|
|
|
+ manifest = d.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'])
|
|
|
|
|
|
if os.access(manifest, os.R_OK):
|
|
|
bb.fatal("Package already staged (%s)?!" % manifest)
|
|
@@ -153,7 +153,7 @@ def sstate_installpkg(ss, d):
|
|
|
bb.mkdirhier(dir)
|
|
|
oe.path.remove(dir)
|
|
|
|
|
|
- sstateinst = bb.data.expand("${WORKDIR}/sstate-install-%s/" % ss['name'], d)
|
|
|
+ sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name'])
|
|
|
sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz"
|
|
|
|
|
|
if not os.path.exists(sstatepkg):
|
|
@@ -246,7 +246,7 @@ def sstate_clean_manifest(manifest, d):
|
|
|
def sstate_clean(ss, d):
|
|
|
import oe.path
|
|
|
|
|
|
- manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d)
|
|
|
+ manifest = d.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'])
|
|
|
|
|
|
if os.path.exists(manifest):
|
|
|
locks = []
|
|
@@ -351,7 +351,7 @@ def sstate_package(ss, d):
|
|
|
|
|
|
tmpdir = d.getVar('TMPDIR', True)
|
|
|
|
|
|
- sstatebuild = bb.data.expand("${WORKDIR}/sstate-build-%s/" % ss['name'], d)
|
|
|
+ sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['name'])
|
|
|
sstatepkg = d.getVar('SSTATE_PKG', True) + '_'+ ss['name'] + ".tgz"
|
|
|
bb.mkdirhier(sstatebuild)
|
|
|
bb.mkdirhier(os.path.dirname(sstatepkg))
|
|
@@ -397,7 +397,7 @@ def pstaging_fetch(sstatepkg, d):
|
|
|
localdata = bb.data.createCopy(d)
|
|
|
bb.data.update_data(localdata)
|
|
|
|
|
|
- dldir = bb.data.expand("${SSTATE_DIR}", localdata)
|
|
|
+ dldir = localdata.expand("${SSTATE_DIR}")
|
|
|
srcuri = "file://" + os.path.basename(sstatepkg)
|
|
|
|
|
|
bb.mkdirhier(dldir)
|
|
@@ -484,7 +484,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
|
|
|
}
|
|
|
|
|
|
for task in range(len(sq_fn)):
|
|
|
- sstatefile = bb.data.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz", d)
|
|
|
+ sstatefile = d.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz")
|
|
|
sstatefile = sstatefile.replace("${BB_TASKHASH}", sq_hash[task])
|
|
|
if os.path.exists(sstatefile):
|
|
|
bb.debug(2, "SState: Found valid sstate file %s" % sstatefile)
|
|
@@ -499,7 +499,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
|
|
|
localdata = bb.data.createCopy(d)
|
|
|
bb.data.update_data(localdata)
|
|
|
|
|
|
- dldir = bb.data.expand("${SSTATE_DIR}", localdata)
|
|
|
+ dldir = localdata.expand("${SSTATE_DIR}")
|
|
|
localdata.setVar('DL_DIR', dldir)
|
|
|
localdata.setVar('PREMIRRORS', mirrors)
|
|
|
|
|
@@ -509,7 +509,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
|
|
|
if task in ret:
|
|
|
continue
|
|
|
|
|
|
- sstatefile = bb.data.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz", d)
|
|
|
+ sstatefile = d.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz")
|
|
|
sstatefile = sstatefile.replace("${BB_TASKHASH}", sq_hash[task])
|
|
|
|
|
|
srcuri = "file://" + os.path.basename(sstatefile)
|