From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 11 Aug 2022 14:17:07 +0000 (+0100)
Subject: insane: Update to allow for class layout changes
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3313
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c6c717a54423480c0ac9ed13861e3c1cc47e2b2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

insane: Update to allow for class layout changes

Make the code more generic to allow for the potential incomming class
layout changes.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 176a42fd0d8..46ea41e2711 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1425,7 +1425,7 @@ python () {
             if bb.data.inherits_class(native_class, d):
 
                 inherited_classes = d.getVar('__inherit_cache', False) or []
-                needle = os.path.join('classes', native_class)
+                needle = "/" + native_class
 
                 bbclassextend = (d.getVar('BBCLASSEXTEND') or '').split()
                 # BBCLASSEXTEND items are always added in the end
@@ -1438,7 +1438,7 @@ python () {
                 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 '/%s.bbclass' % extend_item in class_item:
                                 break
                         else:
                             pn = d.getVar('PN')