diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-19 16:21:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-23 13:52:08 +0100 |
commit | 1d394c64f51a885f8318f1d62d2a0aeab40233d2 (patch) | |
tree | 7f22f9d0716f4ff00323ac770210a54e2f662962 /meta/classes/sstate.bbclass | |
parent | 353171e8419fbb18251f7b1311fbef2cbf5790ca (diff) | |
download | poky-1d394c64f51a885f8318f1d62d2a0aeab40233d2.tar.gz |
sstate: Ensure deploy tasks don't pull in toolchains
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.
(From OE-Core rev: 8047c184f8266fc047c0e5a5524586d414528626)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 29679e6a5e..498dfc681c 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -1090,8 +1090,8 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): | |||
1090 | # do_package_write_* need do_populate_sysroot as they're mainly postinstall dependencies | 1090 | # do_package_write_* need do_populate_sysroot as they're mainly postinstall dependencies |
1091 | if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: | 1091 | if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: |
1092 | return False | 1092 | return False |
1093 | # do_package/packagedata/package_qa don't need do_populate_sysroot | 1093 | # do_package/packagedata/package_qa/deploy don't need do_populate_sysroot |
1094 | if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa']: | 1094 | if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa', 'do_deploy']: |
1095 | continue | 1095 | continue |
1096 | # Native/Cross packages don't exist and are noexec anyway | 1096 | # Native/Cross packages don't exist and are noexec anyway |
1097 | 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']: | 1097 | 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']: |