This reverts commit d3325c384a7df54c564cae093659cf7b692629f2. Moving the QA test for invalid PACKAGECONFIGs to the recipe_qa task turned out to be a bad idea as that task is expected to be architecture independent. So move it back to the qa_configure function. The original problem (that the configure task is not run for packagegroups) will have to be solved in packagegroup.bbclass instead.
Signed-off-by: Peter Kjellerstedt <[email protected]> --- meta/classes-global/insane.bbclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index aeffee7983..7b13e932ff 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1423,6 +1423,16 @@ Rerun configure task after fixing this.""" except subprocess.CalledProcessError: pass + # Check invalid PACKAGECONFIG + pkgconfigs = (d.getVar("PACKAGECONFIG") or "").split() + if pkgconfigs: + pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} + invalid_pkgconfigs = set(pkgconfigs) - set(pkgconfigflags) + if invalid_pkgconfigs: + pn = d.getVar('PN') + error_msg = "%s: invalid PACKAGECONFIG(s): %s" % (pn, " ".join(sorted(invalid_pkgconfigs))) + oe.qa.handle_error("invalid-packageconfig", error_msg, d) + oe.qa.exit_if_errors(d) } @@ -1484,21 +1494,11 @@ python do_recipe_qa() { if re.search(r"git(hu|la)b\.com/.+/.+/archive/.+", url) or "//codeload.github.com/" in url: oe.qa.handle_error("src-uri-bad", "%s: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol" % pn, d) - def test_packageconfig(pn, d): - pkgconfigs = (d.getVar("PACKAGECONFIG") or "").split() - if pkgconfigs: - pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} - invalid_pkgconfigs = set(pkgconfigs) - set(pkgconfigflags) - if invalid_pkgconfigs: - error_msg = "%s: invalid PACKAGECONFIG(s): %s" % (pn, " ".join(sorted(invalid_pkgconfigs))) - oe.qa.handle_error("invalid-packageconfig", error_msg, d) - pn = d.getVar('PN') test_naming(pn, d) test_missing_metadata(pn, d) test_missing_maintainer(pn, d) test_srcuri(pn, d) - test_packageconfig(pn, d) oe.qa.exit_if_errors(d) }
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233435): https://lists.openembedded.org/g/openembedded-core/message/233435 Mute This Topic: https://lists.openembedded.org/mt/118391414/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
