diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch deleted file mode 100644 index 6db4e8bc92..0000000000 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 5 May 2017 09:07:15 +0200 -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc - -user-exec.c has some conditional code to decide how to use the -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path -gets used, which doesn't apply to uClibc. - -Fix this by excluding __UCLIBC__, which ensures we fall back to the -general case of using uc_mcontext.arm_pc, which works fine with -uClibc. - -Signed-off-by: Thomas Petazzoni ---- - accel/tcg/user-exec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 4ebe25461a..0496674fbd 100644 ---- a/accel/tcg/user-exec.c -+++ b/accel/tcg/user-exec.c -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - - #if defined(__NetBSD__) - pc = uc->uc_mcontext.__gregs[_REG_R15]; --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) - pc = uc->uc_mcontext.gregs[R15]; - #else - pc = uc->uc_mcontext.arm_pc; --- -2.25.3 - diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch deleted file mode 100644 index 50762055bf..0000000000 --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Aug 2021 23:40:01 +0200 -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl - -Include linux/fs.h to avoid the following build failure on uclibc or -musl raised since version 6.0.0: - -../block/export/fuse.c: In function 'fuse_lseek': -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { - | ^~~~~~~~~ - | SEEK_SET - -Fixes: - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice@gmail.com/] ---- - block/export/fuse.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index fc7b07d2b5..2e3bf8270b 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,9 @@ - #include - #include - -+#ifdef __linux__ -+#include -+#endif - - /* Prevent overly long bounce buffer allocations */ - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) --- -2.32.0 - diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch deleted file mode 100644 index 4856821843..0000000000 --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Oct 2021 11:52:09 +0200 -Subject: [PATCH] block/export/fuse.c: fix musl build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb -and avoid the following build failure on musl: - -../block/export/fuse.c: In function 'fuse_fallocate': -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b - -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") -Signed-off-by: Fabrice Fontaine -Message-Id: <20211022095209.1319671-1-fontaine.fabrice@gmail.com> -Reviewed-by: Philippe Mathieu-Daudé -Signed-off-by: Kevin Wolf -[Retrieved from: -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] ---- - block/export/fuse.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/block/export/fuse.c b/block/export/fuse.c -index 2e3bf8270b..823c126d23 100644 ---- a/block/export/fuse.c -+++ b/block/export/fuse.c -@@ -31,6 +31,10 @@ - #include - #include - -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) -+#include -+#endif -+ - #ifdef __linux__ - #include - #endif --- -GitLab - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 0613fce493..9411832384 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 919aef6599..97f9f885a1 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 6.1.0 +QEMU_VERSION = 6.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c