diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2025-05-30 12:42:22 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-05-29 22:28:02 -0700 |
| commit | c21040ea2d463f791bcd4b79e605831504decefa (patch) | |
| tree | abfc257ccf8278d11a595d69d918f7b4de43b8cc | |
| parent | a2f704f69ba08e5ca91030d11c9a0f251541f28c (diff) | |
| download | meta-openembedded-c21040ea2d463f791bcd4b79e605831504decefa.tar.gz | |
Revert "waf-samba.bbclass: adapt to qemu.bbclass refactoring"
This reverts commit a8995fc3f352d83b4141f0ff7bbc3f13d0f2767f.
The patches for oe-core were re-worked. But I forgot to recall
this patch.
In fact, inheriting qemu is needed because it sets a clear barriar
for people to use qemu user mode. And the QEMU_OPTIONS settings
are also in qemu.bbclass.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/classes/waf-samba.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index 49d64b096f..cb78ce6b0d 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # waf is a build system which is used by samba related project. | 1 | # waf is a build system which is used by samba related project. |
| 2 | # Obtain details from https://wiki.samba.org/index.php/Waf | 2 | # Obtain details from https://wiki.samba.org/index.php/Waf |
| 3 | # | 3 | # |
| 4 | inherit python3native | 4 | inherit qemu python3native |
| 5 | 5 | ||
| 6 | DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python3" | 6 | DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python3" |
| 7 | 7 | ||
| @@ -77,7 +77,7 @@ do_configure() { | |||
| 77 | echo 'Checking uname release type: "${OLDEST_KERNEL}"' >> ${CROSS_ANSWERS} | 77 | echo 'Checking uname release type: "${OLDEST_KERNEL}"' >> ${CROSS_ANSWERS} |
| 78 | cat ${WAF_CROSS_ANSWERS_PATH}/cross-answers-${TARGET_ARCH}.txt >> ${CROSS_ANSWERS} | 78 | cat ${WAF_CROSS_ANSWERS_PATH}/cross-answers-${TARGET_ARCH}.txt >> ${CROSS_ANSWERS} |
| 79 | 79 | ||
| 80 | qemu_binary="${@oe.qemu.qemu_target_binary(d)}" | 80 | qemu_binary="${@qemu_target_binary(d)}" |
| 81 | if [ "${qemu_binary}" = "qemu-allarch" ]; then | 81 | if [ "${qemu_binary}" = "qemu-allarch" ]; then |
| 82 | qemu_binary="qemuwrapper" | 82 | qemu_binary="qemuwrapper" |
| 83 | fi | 83 | fi |
