[PATCH 1/2] insane: Add missing INSANE_SKIP mechanism for native-last QA check

* [PATCH 1/2] insane: Add missing INSANE_SKIP mechanism for native-last QA check
@ 2021-01-27 21:33 Tomasz Dziendzielski
  2021-01-27 21:33 ` [PATCH 2/2] insane: native-last: Print classes inherited after native/nativesdk Tomasz Dziendzielski
  0 siblings, 1 reply; 5+ messages in thread
From: Tomasz Dziendzielski @ 2021-01-27 21:33 UTC (permalink / raw)
  To: openembedded-core; +Cc: Tomasz Dziendzielski

See [YOCTO #5729] for details.

Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
---
 meta/classes/insane.bbclass | 43 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 3597943ddd..e371c1c71f 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1367,30 +1367,31 @@ python () {
     for i in issues:
         package_qa_handle_error("pkgvarcheck", "%s: Variable %s is set as not being package specific, please fix this." % (d.getVar("FILE"), i), d)
 
-    for native_class in ['native', 'nativesdk']:
-        if bb.data.inherits_class(native_class, d):
-
-            inherited_classes = d.getVar('__inherit_cache', False) or []
-            needle = os.path.join('classes', native_class)
-
-            bbclassextend = (d.getVar('BBCLASSEXTEND') or '').split()
-            # BBCLASSEXTEND items are always added in the end
-            skip_classes = bbclassextend
-            if bb.data.inherits_class('native', d) or 'native' in bbclassextend:
-                # native also inherits nopackages and relocatable bbclasses
-                skip_classes.extend(['nopackages', 'relocatable'])
-
-            for class_item in reversed(inherited_classes):
-                if needle not in class_item:
-                    for extend_item in skip_classes:
-                        if os.path.join('classes', '%s.bbclass' % extend_item) in class_item:
+    if 'native-last' not in (d.getVar('INSANE_SKIP') or "").split():
+        for native_class in ['native', 'nativesdk']:
+            if bb.data.inherits_class(native_class, d):
+
+                inherited_classes = d.getVar('__inherit_cache', False) or []
+                needle = os.path.join('classes', native_class)
+
+                bbclassextend = (d.getVar('BBCLASSEXTEND') or '').split()
+                # BBCLASSEXTEND items are always added in the end
+                skip_classes = bbclassextend
+                if bb.data.inherits_class('native', d) or 'native' in bbclassextend:
+                    # native also inherits nopackages and relocatable bbclasses
+                    skip_classes.extend(['nopackages', 'relocatable'])
+
+                for class_item in reversed(inherited_classes):
+                    if needle not in class_item:
+                        for extend_item in skip_classes:
+                            if os.path.join('classes', '%s.bbclass' % extend_item) in class_item:
+                                break
+                        else:
+                            pn = d.getVar('PN')
+                            package_qa_handle_error("native-last", "%s: native/nativesdk class is not inherited last, this can result in unexpected behaviour. " % pn, d)
                             break
                     else:
-                        pn = d.getVar('PN')
-                        package_qa_handle_error("native-last", "%s: native/nativesdk class is not inherited last, this can result in unexpected behaviour. " % pn, d)
                         break
-                else:
-                    break
 
     qa_sane = d.getVar("QA_SANE")
     if not qa_sane:
-- 
2.30.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread