From 10317912ee319ccf7f83605d438b5cbf9663f296 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 11 Aug 2022 15:17:07 +0100 Subject: insane: Update to allow for class layout changes Make the code more generic to allow for the potential incomming class layout changes. (From OE-Core rev: 7c6c717a54423480c0ac9ed13861e3c1cc47e2b2) Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 176a42fd0d..46ea41e271 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') -- cgit v1.2.3-54-g00ecf