mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 00:32:12 +02:00
sstate: add support for caching shared workdir tasks
The sstate bbclass uses workdir as a hardcoded string in path manipulations. This means that the sstate caching mechanism does not work for the work-shared directory which the kernel uses to share its build configuration and source files for out of tree kernel modules. This commit modifies the path manipulation mechanism to use the work-shared directory if detected in the paths when handling the sstate cache packages. (From OE-Core rev: 27642449f95e38598f9c83948ce109c5891e5877) Signed-off-by: Michael Ho <Michael.Ho@bmw.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
99f505422b
commit
aa83cb5264
@@ -362,7 +362,10 @@ def sstate_installpkgdir(ss, d):
|
||||
|
||||
for plain in ss['plaindirs']:
|
||||
workdir = d.getVar('WORKDIR')
|
||||
sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared")
|
||||
src = sstateinst + "/" + plain.replace(workdir, '')
|
||||
if sharedworkdir in plain:
|
||||
src = sstateinst + "/" + plain.replace(sharedworkdir, '')
|
||||
dest = plain
|
||||
bb.utils.mkdirhier(src)
|
||||
prepdir(dest)
|
||||
@@ -620,8 +623,11 @@ def sstate_package(ss, d):
|
||||
os.rename(state[1], sstatebuild + state[0])
|
||||
|
||||
workdir = d.getVar('WORKDIR')
|
||||
sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared")
|
||||
for plain in ss['plaindirs']:
|
||||
pdir = plain.replace(workdir, sstatebuild)
|
||||
if sharedworkdir in plain:
|
||||
pdir = plain.replace(sharedworkdir, sstatebuild)
|
||||
bb.utils.mkdirhier(plain)
|
||||
bb.utils.mkdirhier(pdir)
|
||||
os.rename(plain, pdir)
|
||||
|
||||
Reference in New Issue
Block a user