]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
sstate: Remove unneeded code from setscene_depvalid() related to useradd
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Nov 2023 09:33:08 +0000 (09:33 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 8 Dec 2023 17:09:29 +0000 (17:09 +0000)
With recent changes to runqueue in bitbake, this horrible hack is no longer needed
and we can drop it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes-global/sstate.bbclass

index 5b27a1f0f9805aa8782e958a24723c8e94d6e762..95d5803f17d87c9892784ce78d77dc9a23dd47b1 100644 (file)
@@ -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']:
             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
         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