base/useradd/sstate: Ensure do_package setscene has correct fakeroot dependencies
PATCH 1/1 base/useradd/sstate: Ensure do_package setscene has correct fakeroot dependencies
The do_package_setscene task needs to depend on fakeroot in order to correctly install its files.
We can whitelist the dependency in the sstate handling code for some performance improvements since we only need this if we're installing the package from sstate.
Also use an append operator in base.bbclass for clarity.
Signed-off-by Richard Purdie <[email protected]>
---
meta/classes/base.bbclass +1 -0
@@ -501,6 +501,7 @@ python () { d.setVarFlag('do_package', 'fakeroot', 1) d.setVarFlag('do_package', 'umask', 022) d.setVarFlag('do_package_setscene', 'fakeroot', 1) + d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_devshell', 'fakeroot', 1) d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', 0)
meta/classes/sstate.bbclass +1 -1
@@ -711,7 +711,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d): # This is due to the [depends] in useradd.bbclass complicating matters # The logic *is* reversed here due to the way hard setscene dependencies are injected - if taskdependees[task][1] == 'do_package' and taskdependees[dep][0].endswith(('shadow-native', 'shadow-sysroot', 'base-passwd')) and taskdependees[dep][1] == 'do_populate_sysroot': + if taskdependees[task][1] == 'do_package' and taskdependees[dep][0].endswith(('shadow-native', 'shadow-sysroot', 'base-passwd', 'pseudo-native')) and taskdependees[dep][1] == 'do_populate_sysroot': continue # Safe fallthrough default
meta/classes/useradd.bbclass +1 -1
@@ -150,7 +150,7 @@ USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shado USERADDSETSCENEDEPS_virtclass-cross = "" USERADDSETSCENEDEPS_class-native = "" USERADDSETSCENEDEPS_class-nativesdk = "" -do_package_setscene[depends] = "${USERADDSETSCENEDEPS}" +do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" # Recipe parse-time sanity checks def update_useradd_after_parse(d):