diff --git a/srcpkgs/qemu-system-microblazeel b/srcpkgs/qemu-system-microblazeel deleted file mode 120000 index d3d421aa08c50d..00000000000000 --- a/srcpkgs/qemu-system-microblazeel +++ /dev/null @@ -1 +0,0 @@ -qemu \ No newline at end of file diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template index 2b5b99e52f1006..08d69d42b6e5f6 100644 --- a/srcpkgs/qemu-user/template +++ b/srcpkgs/qemu-user/template @@ -1,7 +1,7 @@ # Template file for 'qemu-user' # This package should be updated together with qemu pkgname=qemu-user -version=10.2.0 +version=11.0.1 revision=1 build_style=configure metapackage=yes @@ -16,7 +16,7 @@ maintainer="classabbyamp " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://www.qemu.org" distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2" -checksum=d83265d94d80e4a3da87366a8ff6e7bbd29948417adb73fef3f420eeef68a90c +checksum=e1b079492ef4f4d1b25a7b3c37a40a9d0a220e1d6c62173a5129f889697c8726 subpackages="qemu-user-static" if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/qemu/patches/mmap-mremap-efault.patch b/srcpkgs/qemu/patches/mmap-mremap-efault.patch deleted file mode 100644 index 388d11d10d2390..00000000000000 --- a/srcpkgs/qemu/patches/mmap-mremap-efault.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f2adfc703e94819b0daca98fde1d0a30168c292d Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Fri, 8 Jan 2021 17:27:06 +0000 -Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit - -When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an -infinite loop of mremap calls of ever decreasing/increasing addresses. - -I suspect something in the musl memory allocation code loops indefinitely -if it only sees ENOMEM and only exits when it hits EFAULT. - -According to the docs, trying to mremap outside the address space -can/should return EFAULT and changing this allows the build to succeed. - -A better return value for the other cases of invalid addresses is EINVAL -rather than ENOMEM so adjust the other part of the test to this. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] -Signed-off-by: Richard Purdie