mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-11 04:49:58 +00:00
Code Issues Projects Releases Wiki Activity

Revert "nodejs: inherit qemu class conditionally"

Browse Source 
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 b2a950a75b.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alexander Kanavin
2025-06-30 11:56:36 +02:00
committed by Khem Raj
parent e02d4b3bbd
commit 040ba69712
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/nodejs/nodejs_22.16.0.bb
+6 -8
View File
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b4f41dcacabc8f07b9ca7dee2f188a00"
CVE_PRODUCT = "nodejs node.js" CVE_PRODUCT = "nodejs node.js"
DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-native" DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-native"
DEPENDS:append:class-target = " qemu-native"
DEPENDS:append:class-native = " c-ares-native" DEPENDS:append:class-native = " c-ares-native"
inherit pkgconfig python3native ptest siteinfo inherit pkgconfig python3native qemu ptest siteinfo
inherit_defer ${@bb.utils.contains('HOST_AND_TARGET_SAME_WIDTH', '0', 'qemu', '', d)}
COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*"
COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*"
@@ -109,11 +108,11 @@ python do_create_v8_qemu_wrapper () {
on the host.""" on the host."""
qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'),
d.expand('${STAGING_DIR_HOST}${base_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": if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1":
qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), qemu_cmd = ""
qemu_libdirs)
wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh')
with open(wrapper_path, 'w') as wrapper_file: 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 # 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"): if d.getVar("SITEINFO_BITS") == "32" and "64" in d.getVar("BUILD_ARCH"):
d.setVar("HOST_AND_TARGET_SAME_WIDTH", "0") d.setVar("HOST_AND_TARGET_SAME_WIDTH", "0")
d.appendVar("DEPENDS:class-target", " qemu-native")
else: else:
d.setVar("HOST_AND_TARGET_SAME_WIDTH", "1") d.setVar("HOST_AND_TARGET_SAME_WIDTH", "1")
} }