diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-11 15:17:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-12 15:27:17 +0100 |
commit | 10317912ee319ccf7f83605d438b5cbf9663f296 (patch) | |
tree | bf72ec425d5f0489745341732ea366b4b72b3c9c /meta/classes | |
parent | ce08cf4825f0e4e42509794a2dcd53a3ea5126e4 (diff) | |
download | poky-10317912ee319ccf7f83605d438b5cbf9663f296.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/insane.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
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 () { | |||
1425 | if bb.data.inherits_class(native_class, d): | 1425 | if bb.data.inherits_class(native_class, d): |
1426 | 1426 | ||
1427 | inherited_classes = d.getVar('__inherit_cache', False) or [] | 1427 | inherited_classes = d.getVar('__inherit_cache', False) or [] |
1428 | needle = os.path.join('classes', native_class) | 1428 | needle = "/" + native_class |
1429 | 1429 | ||
1430 | bbclassextend = (d.getVar('BBCLASSEXTEND') or '').split() | 1430 | bbclassextend = (d.getVar('BBCLASSEXTEND') or '').split() |
1431 | # BBCLASSEXTEND items are always added in the end | 1431 | # BBCLASSEXTEND items are always added in the end |
@@ -1438,7 +1438,7 @@ python () { | |||
1438 | for class_item in reversed(inherited_classes): | 1438 | for class_item in reversed(inherited_classes): |
1439 | if needle not in class_item: | 1439 | if needle not in class_item: |
1440 | for extend_item in skip_classes: | 1440 | for extend_item in skip_classes: |
1441 | if os.path.join('classes', '%s.bbclass' % extend_item) in class_item: | 1441 | if '/%s.bbclass' % extend_item in class_item: |
1442 | break | 1442 | break |
1443 | else: | 1443 | else: |
1444 | pn = d.getVar('PN') | 1444 | pn = d.getVar('PN') |