From 68e1a8b65903445b821e70cb3a52c929efa2e969 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 22 Apr 2025 17:18:07 +0200 Subject: [PATCH] insane.bbclass: Move test for invalid PACKAGECONFIGs to do_recipe_qa This makes sure invalid PACKAGECONFIGs are reported also for recipes that have no do_configure task, e.g., packagegroups. (From OE-Core rev: ed0e8f5142bc9c3a5c2fca7068135b2dc11ec3db) Signed-off-by: Peter Kjellerstedt Signed-off-by: Steve Sakoman --- 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 fc4ca84b35..748de050e0 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1418,16 +1418,6 @@ Rerun configure task after fixing this.""" except subprocess.CalledProcessError: pass - # Check invalid PACKAGECONFIG - pkgconfig = (d.getVar("PACKAGECONFIG") or "").split() - if pkgconfig: - pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} - for pconfig in pkgconfig: - if pconfig not in pkgconfigflags: - pn = d.getVar('PN') - error_msg = "%s: invalid PACKAGECONFIG: %s" % (pn, pconfig) - oe.qa.handle_error("invalid-packageconfig", error_msg, d) - oe.qa.exit_if_errors(d) } @@ -1475,10 +1465,20 @@ 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 {} + for pkgconfig in pkgconfigs: + if pkgconfig not in pkgconfigflags: + error_msg = "%s: invalid PACKAGECONFIG: %s" % (pn, pkgconfig) + oe.qa.handle_error("invalid-packageconfig", error_msg, d) + pn = d.getVar('PN') test_missing_metadata(pn, d) test_missing_maintainer(pn, d) test_srcuri(pn, d) + test_packageconfig(pn, d) oe.qa.exit_if_errors(d) }