mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

sstate: Improve SSTATE_PKG handling

Browse Source 
Move the task handling code into the SSTATE_PKGNAME variable using a temporary variable.

This makes the code more understandable as as well as allowing the length of the
final sstate filename to be more easily accesses for following patches.

(From OE-Core rev: be603dad6817948cfa09621d2311046631ec4ab2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-12-11 12:06:54 +00:00
parent 4cb1b4b409
commit f3010f7694
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/sstate.bbclass
+11 -10
View File
@@ -11,11 +11,11 @@ def generate_sstatefn(spec, hash, d):
SSTATE_PKGARCH = "${PACKAGE_ARCH}" SSTATE_PKGARCH = "${PACKAGE_ARCH}"
SSTATE_PKGSPEC = "sstate:${PN}:${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}:${PV}:${PR}:${SSTATE_PKGARCH}:${SSTATE_VERSION}:" 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_SWSPEC = "sstate:${PN}::${PV}:${PR}::${SSTATE_VERSION}:"
SSTATE_PKGNAME = "${SSTATE_EXTRAPATH}${@generate_sstatefn(d.getVar('SSTATE_PKGSPEC'), d.getVar('BB_UNIHASH'), d)}" SSTATE_PKGNAME = "${SSTATE_EXTRAPATH}${@generate_sstatefn(d.getVar('SSTATE_PKGSPEC'), d.getVar('BB_UNIHASH'), d)}_${SSTATE_CURRTASK}.tgz"
SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}" SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
SSTATE_EXTRAPATH = "" SSTATE_EXTRAPATH = ""
SSTATE_EXTRAPATHWILDCARD = "" SSTATE_EXTRAPATHWILDCARD = ""
SSTATE_PATHSPEC = "${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/*/${SSTATE_PKGSPEC}" SSTATE_PATHSPEC = "${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/*/${SSTATE_PKGSPEC}*_${SSTATE_PATH_CURRTASK}.tgz*"
# explicitly make PV to depend on evaluated value of PV variable # explicitly make PV to depend on evaluated value of PV variable
PV[vardepvalue] = "${PV}" PV[vardepvalue] = "${PV}"
@@ -317,8 +317,8 @@ def sstate_installpkg(ss, d):
from oe.gpg_sign import get_signer from oe.gpg_sign import get_signer
sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['task']) sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['task'])
sstatefetch = d.getVar('SSTATE_PKGNAME') + '_' + ss['task'] + ".tgz" d.setVar("SSTATE_CURRTASK", ss['task'])
d.appendVar('SSTATE_PKG', '_'+ ss['task'] + ".tgz") sstatefetch = d.getVar('SSTATE_PKGNAME')
sstatepkg = d.getVar('SSTATE_PKG') sstatepkg = d.getVar('SSTATE_PKG')
if not os.path.exists(sstatepkg): if not os.path.exists(sstatepkg):
@@ -440,8 +440,9 @@ python sstate_hardcode_path_unpack () {
def sstate_clean_cachefile(ss, d): def sstate_clean_cachefile(ss, d):
import oe.path import oe.path
sstatepkgfile = d.getVar('SSTATE_PATHSPEC') + "*_" + ss['task'] + ".tgz*"
if d.getVarFlag('do_%s' % ss['task'], 'task'): if d.getVarFlag('do_%s' % ss['task'], 'task'):
d.setVar("SSTATE_PATH_CURRTASK", ss['task'])
sstatepkgfile = d.getVar('SSTATE_PATHSPEC')
bb.note("Removing %s" % sstatepkgfile) bb.note("Removing %s" % sstatepkgfile)
oe.path.remove(sstatepkgfile) oe.path.remove(sstatepkgfile)
@@ -612,7 +613,7 @@ def sstate_package(ss, d):
tmpdir = d.getVar('TMPDIR') tmpdir = d.getVar('TMPDIR')
sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task']) sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task'])
d.appendVar('SSTATE_PKG', '_'+ ss['task'] + ".tgz") d.setVar("SSTATE_CURRTASK", ss['task'])
bb.utils.remove(sstatebuild, recurse=True) bb.utils.remove(sstatebuild, recurse=True)
bb.utils.mkdirhier(sstatebuild) bb.utils.mkdirhier(sstatebuild)
for state in ss['dirs']: for state in ss['dirs']:
@@ -1081,17 +1082,17 @@ addhandler sstate_eventhandler
sstate_eventhandler[eventmask] = "bb.build.TaskSucceeded" sstate_eventhandler[eventmask] = "bb.build.TaskSucceeded"
python sstate_eventhandler() { python sstate_eventhandler() {
d = e.data d = e.data
# When we write an sstate package we rewrite the SSTATE_PKG writtensstate = d.getVar('SSTATE_CURRTASK')
spkg = d.getVar('SSTATE_PKG') if not writtensstate:
if not spkg.endswith(".tgz"):
taskname = d.getVar("BB_RUNTASK")[3:] taskname = d.getVar("BB_RUNTASK")[3:]
spec = d.getVar('SSTATE_PKGSPEC') spec = d.getVar('SSTATE_PKGSPEC')
swspec = d.getVar('SSTATE_SWSPEC') swspec = d.getVar('SSTATE_SWSPEC')
if taskname in ["fetch", "unpack", "patch", "populate_lic", "preconfigure"] and swspec: if taskname in ["fetch", "unpack", "patch", "populate_lic", "preconfigure"] and swspec:
d.setVar("SSTATE_PKGSPEC", "${SSTATE_SWSPEC}") d.setVar("SSTATE_PKGSPEC", "${SSTATE_SWSPEC}")
d.setVar("SSTATE_EXTRAPATH", "") d.setVar("SSTATE_EXTRAPATH", "")
d.setVar("SSTATE_CURRTASK", taskname)
sstatepkg = d.getVar('SSTATE_PKG') sstatepkg = d.getVar('SSTATE_PKG')
bb.siggen.dump_this_task(sstatepkg + '_' + taskname + ".tgz" ".siginfo", d) bb.siggen.dump_this_task(sstatepkg + ".siginfo", d)
} }
SSTATE_PRUNE_OBSOLETEWORKDIR ?= "1" SSTATE_PRUNE_OBSOLETEWORKDIR ?= "1"