From c21040ea2d463f791bcd4b79e605831504decefa Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 30 May 2025 12:42:22 +0800 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- meta-networking/classes/waf-samba.bbclass | 4 ++-- 1 file 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 @@ # waf is a build system which is used by samba related project. # Obtain details from https://wiki.samba.org/index.php/Waf # -inherit python3native +inherit qemu python3native DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python3" @@ -77,7 +77,7 @@ do_configure() { echo 'Checking uname release type: "${OLDEST_KERNEL}"' >> ${CROSS_ANSWERS} cat ${WAF_CROSS_ANSWERS_PATH}/cross-answers-${TARGET_ARCH}.txt >> ${CROSS_ANSWERS} - qemu_binary="${@oe.qemu.qemu_target_binary(d)}" + qemu_binary="${@qemu_target_binary(d)}" if [ "${qemu_binary}" = "qemu-allarch" ]; then qemu_binary="qemuwrapper" fi