diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-31 13:27:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-18 10:15:58 +0000 |
commit | c917323a39da6fc3e8d92b2fe907d0357149c9bb (patch) | |
tree | 254fd4963f6a7c0f65f5cc9aa1834158fc94b457 /meta/recipes-kernel | |
parent | bc883e49912b8d0cdc9ea403e85f2cb3198b48ff (diff) | |
download | poky-c917323a39da6fc3e8d92b2fe907d0357149c9bb.tar.gz |
classes/recipes: Switch to use inherit_defer
Now that bitbake supports the use of inherit_defer, switch all conditional
(variable based) inherits to use this instead. This leads to more a more
deterministic user experience since there is no longer an immediate expansion
and later changes to the variables in question (e.g. a bbappend) are
accounted for.
This patch tries to ensure the behaviour before/after remains as unchanged
as it reasonably can, e.g. by always inherting populate_sdk_base. native
and nativesdk continue to need to be inherited last, hence being used
with inherit_defer in a handful of very specific cases.
(From OE-Core rev: 451363438d38bd4552d5bcec4a92332f5819a5d4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap-native_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 32882afdf4..4f26813de0 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -54,7 +54,7 @@ PROVIDES = "virtual/perf" | |||
54 | inherit linux-kernel-base kernel-arch manpages | 54 | inherit linux-kernel-base kernel-arch manpages |
55 | 55 | ||
56 | # needed for building the tools/perf Python bindings | 56 | # needed for building the tools/perf Python bindings |
57 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} | 57 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} |
58 | inherit python3-dir | 58 | inherit python3-dir |
59 | export PYTHON_SITEPACKAGES_DIR | 59 | export PYTHON_SITEPACKAGES_DIR |
60 | 60 | ||
diff --git a/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/meta/recipes-kernel/systemtap/systemtap-native_git.bb index 19cc1cf0f0..2690b259c8 100644 --- a/meta/recipes-kernel/systemtap/systemtap-native_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap-native_git.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | require systemtap_git.bb | 2 | require systemtap_git.bb |
3 | 3 | ||
4 | inherit native | 4 | inherit_defer native |
5 | 5 | ||
6 | addtask addto_recipe_sysroot after do_populate_sysroot before do_build | 6 | addtask addto_recipe_sysroot after do_populate_sysroot before do_build |
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 0a1349e128..68f5c76428 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb | |||
@@ -33,7 +33,7 @@ PACKAGECONFIG[python3-probes] = "--with-python3-probes,--without-python3-probes, | |||
33 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod" | 33 | PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod" |
34 | 34 | ||
35 | inherit autotools gettext pkgconfig systemd | 35 | inherit autotools gettext pkgconfig systemd |
36 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'setuptools3-base', '', d)} | 36 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'setuptools3-base', '', d)} |
37 | 37 | ||
38 | # | ../git/elaborate.cxx:2601:21: error: storing the address of local variable 'sym' in '*s.systemtap_session::symbol_resolver' [-Werror=dangling-pointer=] | 38 | # | ../git/elaborate.cxx:2601:21: error: storing the address of local variable 'sym' in '*s.systemtap_session::symbol_resolver' [-Werror=dangling-pointer=] |
39 | CXXFLAGS += "-Wno-dangling-pointer" | 39 | CXXFLAGS += "-Wno-dangling-pointer" |