If an image is built from sstate, the cross toolchain was being pulled in.
This was due to the sstate dependencies for deploy tasks not being considered
in the "depvalid" logic.

do_deploy tasks do not need their populate_sysroot dependencies when installed
from sstate so skip these. This reduces the sstate pulled in by an image
build from sstate significantly.

Signed-off-by: Richard Purdie <[email protected]>
---
 meta/classes/sstate.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 29679e6a5ee..498dfc681cf 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -1090,8 +1090,8 @@ def setscene_depvalid(task, taskdependees, notneeded, d, 
log=None):
         # do_package_write_* need do_populate_sysroot as they're mainly 
postinstall dependencies
         if taskdependees[task][1] == "do_populate_sysroot" and 
taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 
'do_package_write_rpm']:
             return False
-        # do_package/packagedata/package_qa don't need do_populate_sysroot
-        if taskdependees[task][1] == "do_populate_sysroot" and 
taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa']:
+        # do_package/packagedata/package_qa/deploy don't need 
do_populate_sysroot
+        if taskdependees[task][1] == "do_populate_sysroot" and 
taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa', 
'do_deploy']:
             continue
         # Native/Cross packages don't exist and are noexec anyway
         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']:
-- 
2.32.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156179): 
https://lists.openembedded.org/g/openembedded-core/message/156179
Mute This Topic: https://lists.openembedded.org/mt/85739579/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to