diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-29 09:33:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-08 17:09:34 +0000 |
commit | f73e52dd71156ebcb5016f1241eebb889417e3e4 (patch) | |
tree | a35bd357d158e35f46ce19199deebfc2fc62fb06 /meta/classes-global/sstate.bbclass | |
parent | fcd9f34dccdc1e10a929e44f036d136ca349c27b (diff) | |
download | poky-f73e52dd71156ebcb5016f1241eebb889417e3e4.tar.gz |
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>
Diffstat (limited to 'meta/classes-global/sstate.bbclass')
-rw-r--r-- | meta/classes-global/sstate.bbclass | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 5b27a1f0f9..95d5803f17 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass | |||
@@ -1117,11 +1117,6 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): | |||
1117 | 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']: | 1117 | 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']: |
1118 | continue | 1118 | continue |
1119 | 1119 | ||
1120 | # This is due to the [depends] in useradd.bbclass complicating matters | ||
1121 | # The logic *is* reversed here due to the way hard setscene dependencies are injected | ||
1122 | 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': | ||
1123 | continue | ||
1124 | |||
1125 | # Consider sysroot depending on sysroot tasks | 1120 | # Consider sysroot depending on sysroot tasks |
1126 | if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot': | 1121 | if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot': |
1127 | # Allow excluding certain recursive dependencies. If a recipe needs it should add a | 1122 | # Allow excluding certain recursive dependencies. If a recipe needs it should add a |