mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
sstate: Remove unneeded code from setscene_depvalid() related to useradd
With recent changes to runqueue in bitbake, this horrible hack is no longer needed and we can drop it. (From OE-Core rev: f7f50b6013f7b636fe46448b1cbe1473de891527) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1117,11 +1117,6 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
|
|||||||
if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package', 'do_package_qa']:
|
if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package', 'do_package_qa']:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# 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' or taskdependees[task][1] == 'do_populate_sysroot') and taskdependees[dep][0].endswith(('shadow-native', 'shadow-sysroot', 'base-passwd', 'pseudo-native')) and taskdependees[dep][1] == 'do_populate_sysroot':
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Consider sysroot depending on sysroot tasks
|
# Consider sysroot depending on sysroot tasks
|
||||||
if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot':
|
if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot':
|
||||||
# Allow excluding certain recursive dependencies. If a recipe needs it should add a
|
# Allow excluding certain recursive dependencies. If a recipe needs it should add a
|
||||||
|
|||||||
Reference in New Issue
Block a user