From 46e30464b4d4f2c826723791264629638a32a518 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Jul 2024 22:27:00 +0100 Subject: qemu: Drop mips workaround In local testing this appears to not be needed any more. Since the bash dependency is painful in many different ways, particularly being injected at do_package time, drop it all. (From OE-Core rev: b30c1e5805b3f108a2d0a30259b50b9e7db0f6cc) Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 6a5ab56436..4a15c97d93 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -155,20 +155,6 @@ do_install () { rm ${D}${datadir}/qemu/hppa* -f } -# The following fragment will create a wrapper for qemu-mips user emulation -# binary in order to work around a segmentation fault issue. Basically, by -# default, the reserved virtual address space for 32-on-64 bit is set to 4GB. -# This will trigger a MMU access fault in the virtual CPU. With this change, -# the qemu-mips works fine. -# IMPORTANT: This piece needs to be removed once the root cause is fixed! -do_install:append() { - if [ -e "${D}/${bindir}/qemu-mips" ]; then - create_wrapper ${D}/${bindir}/qemu-mips \ - QEMU_RESERVED_VA=0x0 - fi -} -# END of qemu-mips workaround - # Disable kvm/virgl/mesa on targets that do not support it PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+" PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+ pie" @@ -258,9 +244,6 @@ python split_qemu_packages () { subpackages += do_split_packages(d, archdir, r'^qemu-((?!system|edid|ga|img|io|nbd|pr-helper|storage-daemon).*)$', '${PN}-user-%s', 'QEMU full user emulation binaries(%s)' , prepend=True, extra_depends='${PN}-common') if subpackages: d.appendVar('RDEPENDS:' + d.getVar('PN'), ' ' + ' '.join(subpackages)) - mipspackage = d.getVar('PN') + "-user-mips" - if mipspackage in ' '.join(subpackages): - d.appendVar('RDEPENDS:' + mipspackage, ' ' + d.getVar("MLPREFIX") + 'bash') } # Put the guest agent in a separate package -- cgit v1.2.3-54-g00ecf