From 040ba697122ce4f4c6684abe22d4c18dda9b562f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 30 Jun 2025 11:56:36 +0200 Subject: Revert "nodejs: inherit qemu class conditionally" Plenty of other recipes inherit qemu unconditionally, including some pretty foundational ones like python3, and they do not need this fix. I think something else is going on here, and that issue needs to be properly investigated. There's a request to provide steps to observe the issue, but the original patch author so far hasn't been able to reproduce it on demand: https://lists.openembedded.org/g/openembedded-devel/topic/113861973 This reverts commit b2a950a75b15c93f625bfe6514bc248c9310813f. Signed-off-by: Alexander Kanavin Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb index 679acafabf..4bc829f140 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b4f41dcacabc8f07b9ca7dee2f188a00" CVE_PRODUCT = "nodejs node.js" DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-native" +DEPENDS:append:class-target = " qemu-native" DEPENDS:append:class-native = " c-ares-native" -inherit pkgconfig python3native ptest siteinfo -inherit_defer ${@bb.utils.contains('HOST_AND_TARGET_SAME_WIDTH', '0', 'qemu', '', d)} - +inherit pkgconfig python3native qemu ptest siteinfo COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" @@ -109,11 +108,11 @@ python do_create_v8_qemu_wrapper () { on the host.""" qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), d.expand('${STAGING_DIR_HOST}${base_libdir}')] - qemu_cmd = "" + qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), + qemu_libdirs) - if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "0": - qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), - qemu_libdirs) + if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1": + qemu_cmd = "" wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') with open(wrapper_path, 'w') as wrapper_file: @@ -210,7 +209,6 @@ python __anonymous () { # 32 bit target and 64 bit host (x86-64 or aarch64) have different bit width if d.getVar("SITEINFO_BITS") == "32" and "64" in d.getVar("BUILD_ARCH"): d.setVar("HOST_AND_TARGET_SAME_WIDTH", "0") - d.appendVar("DEPENDS:class-target", " qemu-native") else: d.setVar("HOST_AND_TARGET_SAME_WIDTH", "1") } -- cgit v1.2.3-54-g00ecf