mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user