mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
staging: Allow removal of stale sysroot objects
The main sysroot components of unreachable build targets will be removed by the core code. This currently doesn't trigger a removal in the individual workdirs. This adds in symlinking between the complete stamps and the component sysroot meaning we can detect when someting was removed and hence remove it from the sysroot. This fixes cases where DISTRO_FEATURES like systemd are changed amongst other things and makes builds more robust against configuration changes. If a dependency is rebuild, that is caught by checksum comparision code elsewhere in this function as before. (From OE-Core rev: 7656347c556915dc9acc5a2311ec4e879de6f43d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -490,6 +490,18 @@ python extend_recipe_sysroot() {
|
||||
fixme['native'] = []
|
||||
postinsts = []
|
||||
multilibs = {}
|
||||
manifests = {}
|
||||
|
||||
for f in os.listdir(depdir):
|
||||
if not f.endswith(".complete"):
|
||||
continue
|
||||
f = depdir + "/" + f
|
||||
if os.path.islink(f) and not os.path.exists(f):
|
||||
bb.note("%s no longer exists, removing from sysroot" % f)
|
||||
lnk = os.readlink(f.replace(".complete", ""))
|
||||
sstate_clean_manifest(depdir + "/" + lnk, d, workdir)
|
||||
os.unlink(f)
|
||||
os.unlink(f.replace(".complete", ""))
|
||||
|
||||
for dep in configuredeps:
|
||||
c = setscenedeps[dep][0]
|
||||
@@ -547,6 +559,7 @@ python extend_recipe_sysroot() {
|
||||
bb.warn("Manifest %s not found?" % manifest)
|
||||
else:
|
||||
with open(manifest, "r") as f, open(taskmanifest, 'w') as m:
|
||||
manifests[dep] = manifest
|
||||
for l in f:
|
||||
l = l.strip()
|
||||
if l.endswith("/"):
|
||||
@@ -573,9 +586,9 @@ python extend_recipe_sysroot() {
|
||||
for p in postinsts:
|
||||
subprocess.check_output(p, shell=True)
|
||||
|
||||
for dep in configuredeps:
|
||||
for dep in manifests:
|
||||
c = setscenedeps[dep][0]
|
||||
open(depdir + "/" + c + ".complete", "w").close()
|
||||
os.symlink(manifests[dep], depdir + "/" + c + ".complete")
|
||||
|
||||
bb.utils.unlockfile(lock)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user