diff options
author | Yoann Congal <yoann.congal@smile.fr> | 2023-06-28 09:10:37 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-07-20 12:10:40 -1000 |
commit | 1b485f13a70d640e40f14cf4cb955abfacfaffe4 (patch) | |
tree | c77b75ce4ab77d7ebc685309c60503f8450ba4d5 | |
parent | a4c05306f59db6f1af9d6a5786dbd62ae0938494 (diff) | |
download | poky-1b485f13a70d640e40f14cf4cb955abfacfaffe4.tar.gz |
recipetool: Fix inherit in created -native* recipes
native and nativesdk classes are special and must be inherited last :
put them at the end of the gathered classes to inherit.
(From OE-Core rev: 6de7a92c4366f8b15ff97e53be91db31348b3922)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a6614fd800cbe791264aeb102d379ba79bd145c2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | scripts/lib/recipetool/create.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 824ac6350d..e99e0714bf 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -745,6 +745,10 @@ def create_recipe(args): | |||
745 | for handler in handlers: | 745 | for handler in handlers: |
746 | handler.process(srctree_use, classes, lines_before, lines_after, handled, extravalues) | 746 | handler.process(srctree_use, classes, lines_before, lines_after, handled, extravalues) |
747 | 747 | ||
748 | # native and nativesdk classes are special and must be inherited last | ||
749 | # If present, put them at the end of the classes list | ||
750 | classes.sort(key=lambda c: c in ("native", "nativesdk")) | ||
751 | |||
748 | extrafiles = extravalues.pop('extrafiles', {}) | 752 | extrafiles = extravalues.pop('extrafiles', {}) |
749 | extra_pn = extravalues.pop('PN', None) | 753 | extra_pn = extravalues.pop('PN', None) |
750 | extra_pv = extravalues.pop('PV', None) | 754 | extra_pv = extravalues.pop('PV', None) |