diff mbox series

[poky,kirkstone,BACKPORT,3/3] sstate: Remove unneeded code from setscene_depvalid() related to useradd

Message ID 20241117204118.3405309-4-gael.portay+rtone@gmail.com
State New
Headers show
Series useradd: Fix issues with useradd dependencies | expand

Commit Message

Gaël PORTAY Nov. 17, 2024, 8:41 p.m. UTC 
From: Richard Purdie <richard.purdie@linuxfoundation.org>

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>
Signed-off-by: Thibaud Dufour <thibaudd@rtone.fr>
Signed-off-by: Gaël PORTAY <gael.portay+rtone@gmail.com>
---
 meta/classes/sstate.bbclass | 5 -----
 1 file changed, 5 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 91d42665c1..b05766ce4f 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -1123,11 +1123,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