diff options
| author | Kai Kang <kai.kang@windriver.com> | 2024-06-04 09:45:42 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-08-01 06:08:09 -0700 |
| commit | 0744992e24f6410d7ec958d3e1a6e8dda514a546 (patch) | |
| tree | 088a4fce1d985d838d8700bdfe751422dafb7a95 /meta/classes-recipe | |
| parent | 4c7d6422ffdcacb7402bb8e91f31cb849154c384 (diff) | |
| download | poky-0744992e24f6410d7ec958d3e1a6e8dda514a546.tar.gz | |
cmake-qemu.bbclass: fix if criterion
It always executes the scripts whether 'qemu-usermode' in
'MACHINE_FEATURES' or not. Fix the criterion to make it work.
(From OE-Core rev: 6f73c5df726eef7db32ab0fd1aa2ea4e45b3493c)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9e163246dcbbd2187c9ba28432c613b0d6c850c6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/classes-recipe')
| -rw-r--r-- | meta/classes-recipe/cmake-qemu.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/cmake-qemu.bbclass b/meta/classes-recipe/cmake-qemu.bbclass index 46a89e2827..383fc74bf2 100644 --- a/meta/classes-recipe/cmake-qemu.bbclass +++ b/meta/classes-recipe/cmake-qemu.bbclass | |||
| @@ -19,7 +19,7 @@ inherit qemu cmake | |||
| 19 | DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" | 19 | DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" |
| 20 | 20 | ||
| 21 | cmake_do_generate_toolchain_file:append:class-target() { | 21 | cmake_do_generate_toolchain_file:append:class-target() { |
| 22 | if [ "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}" ]; then | 22 | if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then |
| 23 | # Write out a qemu wrapper that will be used as exe_wrapper so that cmake | 23 | # Write out a qemu wrapper that will be used as exe_wrapper so that cmake |
| 24 | # can run target helper binaries through that. This also allows to execute ctest. | 24 | # can run target helper binaries through that. This also allows to execute ctest. |
| 25 | qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" | 25 | qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" |
