diff options
-rw-r--r-- | meta/classes/sstate.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 64808f8e10..eb1ecd6822 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -318,7 +318,8 @@ def sstate_installpkg(ss, d): | |||
318 | 318 | ||
319 | sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['task']) | 319 | sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['task']) |
320 | sstatefetch = d.getVar('SSTATE_PKGNAME') + '_' + ss['task'] + ".tgz" | 320 | sstatefetch = d.getVar('SSTATE_PKGNAME') + '_' + ss['task'] + ".tgz" |
321 | sstatepkg = d.getVar('SSTATE_PKG') + '_' + ss['task'] + ".tgz" | 321 | d.appendVar('SSTATE_PKG', '_'+ ss['task'] + ".tgz") |
322 | sstatepkg = d.getVar('SSTATE_PKG') | ||
322 | 323 | ||
323 | if not os.path.exists(sstatepkg): | 324 | if not os.path.exists(sstatepkg): |
324 | pstaging_fetch(sstatefetch, d) | 325 | pstaging_fetch(sstatefetch, d) |
@@ -330,7 +331,6 @@ def sstate_installpkg(ss, d): | |||
330 | sstate_clean(ss, d) | 331 | sstate_clean(ss, d) |
331 | 332 | ||
332 | d.setVar('SSTATE_INSTDIR', sstateinst) | 333 | d.setVar('SSTATE_INSTDIR', sstateinst) |
333 | d.setVar('SSTATE_PKG', sstatepkg) | ||
334 | 334 | ||
335 | if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False): | 335 | if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False): |
336 | signer = get_signer(d, 'local') | 336 | signer = get_signer(d, 'local') |
@@ -612,7 +612,8 @@ def sstate_package(ss, d): | |||
612 | tmpdir = d.getVar('TMPDIR') | 612 | tmpdir = d.getVar('TMPDIR') |
613 | 613 | ||
614 | sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task']) | 614 | sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task']) |
615 | sstatepkg = d.getVar('SSTATE_PKG') + '_'+ ss['task'] + ".tgz" | 615 | d.appendVar('SSTATE_PKG', '_'+ ss['task'] + ".tgz") |
616 | sstatepkg = d.getVar('SSTATE_PKG') | ||
616 | bb.utils.remove(sstatebuild, recurse=True) | 617 | bb.utils.remove(sstatebuild, recurse=True) |
617 | bb.utils.mkdirhier(sstatebuild) | 618 | bb.utils.mkdirhier(sstatebuild) |
618 | bb.utils.mkdirhier(os.path.dirname(sstatepkg)) | 619 | bb.utils.mkdirhier(os.path.dirname(sstatepkg)) |
@@ -648,7 +649,6 @@ def sstate_package(ss, d): | |||
648 | os.rename(plain, pdir) | 649 | os.rename(plain, pdir) |
649 | 650 | ||
650 | d.setVar('SSTATE_BUILDDIR', sstatebuild) | 651 | d.setVar('SSTATE_BUILDDIR', sstatebuild) |
651 | d.setVar('SSTATE_PKG', sstatepkg) | ||
652 | d.setVar('SSTATE_INSTDIR', sstatebuild) | 652 | d.setVar('SSTATE_INSTDIR', sstatebuild) |
653 | 653 | ||
654 | if d.getVar('SSTATE_SKIP_CREATION') == '1': | 654 | if d.getVar('SSTATE_SKIP_CREATION') == '1': |