diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-01 12:51:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-15 08:27:03 +0100 |
commit | 43fa40ba51741fc9663680901346f8f64b534ff5 (patch) | |
tree | 4d97d229d888b01868f867ff5ac2d9a115332488 /meta/classes/insane.bbclass | |
parent | 8ce0013eddf039ef7d114073a6b53462a4cb4c5c (diff) | |
download | poky-43fa40ba51741fc9663680901346f8f64b534ff5.tar.gz |
insane: Reword staging to refer to populate_sysroot
'staging' is a term lost in time. This code now operates on the sysroots,
adjust the naming and messages to be more correct/appropriate.
(From OE-Core rev: 5753b6bc5b106ab5fd3652c24ef6a1f94f983424)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/insane.bbclass')
-rw-r--r-- | meta/classes/insane.bbclass | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 746a13c27b..e571d72e18 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -1151,13 +1151,14 @@ python do_package_qa_setscene () { | |||
1151 | } | 1151 | } |
1152 | addtask do_package_qa_setscene | 1152 | addtask do_package_qa_setscene |
1153 | 1153 | ||
1154 | python do_qa_staging() { | 1154 | python do_qa_sysroot() { |
1155 | bb.note("QA checking staging") | 1155 | bb.note("QA checking do_populate_sysroot") |
1156 | sysroot_destdir = d.expand('${SYSROOT_DESTDIR}') | 1156 | sysroot_destdir = d.expand('${SYSROOT_DESTDIR}') |
1157 | for sysroot_dir in d.expand('${SYSROOT_DIRS}').split(): | 1157 | for sysroot_dir in d.expand('${SYSROOT_DIRS}').split(): |
1158 | qa_check_staged(sysroot_destdir + sysroot_dir, d) | 1158 | qa_check_staged(sysroot_destdir + sysroot_dir, d) |
1159 | oe.qa.exit_with_message_if_errors("QA staging was broken by the package built above", d) | 1159 | oe.qa.exit_with_message_if_errors("do_populate_sysroot for this recipe installed files with QA issues", d) |
1160 | } | 1160 | } |
1161 | do_populate_sysroot[postfuncs] += "do_qa_sysroot" | ||
1161 | 1162 | ||
1162 | python do_qa_patch() { | 1163 | python do_qa_patch() { |
1163 | import subprocess | 1164 | import subprocess |
@@ -1349,10 +1350,6 @@ python do_qa_unpack() { | |||
1349 | unpack_check_src_uri(d.getVar('PN'), d) | 1350 | unpack_check_src_uri(d.getVar('PN'), d) |
1350 | } | 1351 | } |
1351 | 1352 | ||
1352 | # The Staging Func, to check all staging | ||
1353 | #addtask qa_staging after do_populate_sysroot before do_build | ||
1354 | do_populate_sysroot[postfuncs] += "do_qa_staging " | ||
1355 | |||
1356 | # Check for patch fuzz | 1353 | # Check for patch fuzz |
1357 | do_patch[postfuncs] += "do_qa_patch " | 1354 | do_patch[postfuncs] += "do_qa_patch " |
1358 | 1355 | ||