diff options
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index e4338e0f78..0d16d118d9 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -24,16 +24,16 @@ python () { | |||
24 | if bb.data.inherits_class('native', d): | 24 | if bb.data.inherits_class('native', d): |
25 | d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH')) | 25 | d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH')) |
26 | elif bb.data.inherits_class('cross', d): | 26 | elif bb.data.inherits_class('cross', d): |
27 | d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TUNE_PKGARCH}", d)) | 27 | d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TUNE_PKGARCH}")) |
28 | d.setVar('SSTATE_MANMACH', bb.data.expand("${BUILD_ARCH}_${MACHINE}", d)) | 28 | d.setVar('SSTATE_MANMACH', d.expand("${BUILD_ARCH}_${MACHINE}")) |
29 | elif bb.data.inherits_class('crosssdk', d): | 29 | elif bb.data.inherits_class('crosssdk', d): |
30 | d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${PACKAGE_ARCH}", d)) | 30 | d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${PACKAGE_ARCH}")) |
31 | elif bb.data.inherits_class('nativesdk', d): | 31 | elif bb.data.inherits_class('nativesdk', d): |
32 | d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}", d)) | 32 | d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}")) |
33 | elif bb.data.inherits_class('cross-canadian', d): | 33 | elif bb.data.inherits_class('cross-canadian', d): |
34 | d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}_${PACKAGE_ARCH}", d)) | 34 | d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}")) |
35 | else: | 35 | else: |
36 | d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d)) | 36 | d.setVar('SSTATE_MANMACH', d.expand("${MACHINE}")) |
37 | 37 | ||
38 | # These classes encode staging paths into their scripts data so can only be | 38 | # These classes encode staging paths into their scripts data so can only be |
39 | # reused if we manipulate the paths | 39 | # reused if we manipulate the paths |
@@ -97,8 +97,8 @@ def sstate_install(ss, d): | |||
97 | 97 | ||
98 | sharedfiles = [] | 98 | sharedfiles = [] |
99 | shareddirs = [] | 99 | shareddirs = [] |
100 | bb.mkdirhier(bb.data.expand("${SSTATE_MANIFESTS}", d)) | 100 | bb.mkdirhier(d.expand("${SSTATE_MANIFESTS}")) |
101 | manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d) | 101 | manifest = d.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name']) |
102 | 102 | ||
103 | if os.access(manifest, os.R_OK): | 103 | if os.access(manifest, os.R_OK): |
104 | bb.fatal("Package already staged (%s)?!" % manifest) | 104 | bb.fatal("Package already staged (%s)?!" % manifest) |
@@ -153,7 +153,7 @@ def sstate_installpkg(ss, d): | |||
153 | bb.mkdirhier(dir) | 153 | bb.mkdirhier(dir) |
154 | oe.path.remove(dir) | 154 | oe.path.remove(dir) |
155 | 155 | ||
156 | sstateinst = bb.data.expand("${WORKDIR}/sstate-install-%s/" % ss['name'], d) | 156 | sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name']) |
157 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz" | 157 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_' + ss['name'] + ".tgz" |
158 | 158 | ||
159 | if not os.path.exists(sstatepkg): | 159 | if not os.path.exists(sstatepkg): |
@@ -246,7 +246,7 @@ def sstate_clean_manifest(manifest, d): | |||
246 | def sstate_clean(ss, d): | 246 | def sstate_clean(ss, d): |
247 | import oe.path | 247 | import oe.path |
248 | 248 | ||
249 | manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d) | 249 | manifest = d.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name']) |
250 | 250 | ||
251 | if os.path.exists(manifest): | 251 | if os.path.exists(manifest): |
252 | locks = [] | 252 | locks = [] |
@@ -351,7 +351,7 @@ def sstate_package(ss, d): | |||
351 | 351 | ||
352 | tmpdir = d.getVar('TMPDIR', True) | 352 | tmpdir = d.getVar('TMPDIR', True) |
353 | 353 | ||
354 | sstatebuild = bb.data.expand("${WORKDIR}/sstate-build-%s/" % ss['name'], d) | 354 | sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['name']) |
355 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_'+ ss['name'] + ".tgz" | 355 | sstatepkg = d.getVar('SSTATE_PKG', True) + '_'+ ss['name'] + ".tgz" |
356 | bb.mkdirhier(sstatebuild) | 356 | bb.mkdirhier(sstatebuild) |
357 | bb.mkdirhier(os.path.dirname(sstatepkg)) | 357 | bb.mkdirhier(os.path.dirname(sstatepkg)) |
@@ -397,7 +397,7 @@ def pstaging_fetch(sstatepkg, d): | |||
397 | localdata = bb.data.createCopy(d) | 397 | localdata = bb.data.createCopy(d) |
398 | bb.data.update_data(localdata) | 398 | bb.data.update_data(localdata) |
399 | 399 | ||
400 | dldir = bb.data.expand("${SSTATE_DIR}", localdata) | 400 | dldir = localdata.expand("${SSTATE_DIR}") |
401 | srcuri = "file://" + os.path.basename(sstatepkg) | 401 | srcuri = "file://" + os.path.basename(sstatepkg) |
402 | 402 | ||
403 | bb.mkdirhier(dldir) | 403 | bb.mkdirhier(dldir) |
@@ -484,7 +484,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): | |||
484 | } | 484 | } |
485 | 485 | ||
486 | for task in range(len(sq_fn)): | 486 | for task in range(len(sq_fn)): |
487 | sstatefile = bb.data.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz", d) | 487 | sstatefile = d.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz") |
488 | sstatefile = sstatefile.replace("${BB_TASKHASH}", sq_hash[task]) | 488 | sstatefile = sstatefile.replace("${BB_TASKHASH}", sq_hash[task]) |
489 | if os.path.exists(sstatefile): | 489 | if os.path.exists(sstatefile): |
490 | bb.debug(2, "SState: Found valid sstate file %s" % sstatefile) | 490 | 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): | |||
499 | localdata = bb.data.createCopy(d) | 499 | localdata = bb.data.createCopy(d) |
500 | bb.data.update_data(localdata) | 500 | bb.data.update_data(localdata) |
501 | 501 | ||
502 | dldir = bb.data.expand("${SSTATE_DIR}", localdata) | 502 | dldir = localdata.expand("${SSTATE_DIR}") |
503 | localdata.setVar('DL_DIR', dldir) | 503 | localdata.setVar('DL_DIR', dldir) |
504 | localdata.setVar('PREMIRRORS', mirrors) | 504 | localdata.setVar('PREMIRRORS', mirrors) |
505 | 505 | ||
@@ -509,7 +509,7 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): | |||
509 | if task in ret: | 509 | if task in ret: |
510 | continue | 510 | continue |
511 | 511 | ||
512 | sstatefile = bb.data.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz", d) | 512 | sstatefile = d.expand("${SSTATE_DIR}/" + sq_hashfn[task] + "_" + mapping[sq_task[task]] + ".tgz") |
513 | sstatefile = sstatefile.replace("${BB_TASKHASH}", sq_hash[task]) | 513 | sstatefile = sstatefile.replace("${BB_TASKHASH}", sq_hash[task]) |
514 | 514 | ||
515 | srcuri = "file://" + os.path.basename(sstatefile) | 515 | srcuri = "file://" + os.path.basename(sstatefile) |