insane: consider INSANE_SKIP without package-specifier too

this is needed for the updated linux-firmware as it needs this INSANE_SKIP support

Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 604939186cc08ab0429ebe00f3e32661847f0cf0)

Adjusted for pyro context
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 42cd15c531d68e48379cd24cbc3a09f78f4d7b8a..0c11c365837601a3a8e93cc9525ad612028f92ee 100644 (file)
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1154,7 +1154,8 @@ python do_package_qa () {
                     oe.utils.write_ld_so_conf(d)
             return warnchecks, errorchecks
 
-        skip = (d.getVar('INSANE_SKIP_' + package) or "").split()
+        skip = set((d.getVar('INSANE_SKIP') or "").split() +
+                   (d.getVar('INSANE_SKIP_' + package) or "").split())
         if skip:
             bb.note("Package %s skipping QA tests: %s" % (package, str(skip)))