package/qemu: bump to version 8.0.0
PATCH 1/1 package/qemu: bump to version 8.0.0
Changes log:
https://wiki.qemu.org/ChangeLog/8.0
Remove upstream patch:
0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch 0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
Remove --disable-virtiofsd [1]
The "linux-user: fix compat with glibc >= 2.36 sys/mount.h" fix has been reverted, so Qemu expect distros to ship the 2.36 maint release with the fix [2]. So any existing glibc 2.36 based toolchain without the fix will fail again to build qemu.
System emulation on 32-bit x86 hosts has been deprecated. The QEMU project no longer considers 32-bit x86 host support for system emulation to be an effective use of its limited resources, and thus intends to discontinue. User mode emulation continues to be supported on 32-bit hosts
Disable Hexagon idef-parser compiler to avoid build issue while building hexagon-linux-user for the target. Indeed idef-parser is a host (native) tool that requires host-glib2, host-flex and host-bison. Keep it disabled for now since hexagon-linux-user build with --disable-hexagon-idef-parser.
Runtime tested in gitlab:
https://gitlab.com/kubu93/buildroot/-/pipelines/845076149
[1] https://gitlab.com/qemu-project/qemu/-/commit/8ab5e8a503b55eb27672777cfedea902bb22a246
[2] https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e
[3] https://gitlab.com/qemu-project/qemu/-/blob/v8.0.0/target/hexagon/meson.build#L191
---
This patch has been rebased onto "package/qemu: bump version to 7.2.1" since we may want to backport host libc-2.37 fix for 2023.02:
http://lists.busybox.net/pipermail/buildroot/2023-April/666598.html
--- ...er-add-more-compat-ioctl-definitions.patch | 73 ----------------- ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 5 +- 4 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch delete mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch deleted +0 -73
@@ -1,73 +0,0 @@ -From ba43bb7b641a602081554d7d2a497888209fec2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]> -Date: Tue, 10 Jan 2023 12:49:00 -0500 -Subject: [PATCH 3/4] Revert "linux-user: add more compat ioctl definitions" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. - -glibc has fixed (in 2.36.9000-40-g774058d729) the problem -that caused a clash when both sys/mount.h annd linux/mount.h -are included, and backported this to the 2.36 stable release -too: - - https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -It is saner for QEMU to remove the workaround it applied for -glibc 2.36 and expect distros to ship the 2.36 maint release -with the fix. This avoids needing to add a further workaround -to QEMU to deal with the fact that linux/brtfs.h now also pulls -in linux/mount.h via linux/fs.h since Linux 6.1 - -Signed-off-by: Daniel P. Berrangé <[email protected]> -Reviewed-by: Marc-André Lureau <[email protected]> -Message-Id: <[email protected]> -Signed-off-by: Laurent Vivier <[email protected]> - -[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a] -Signed-off-by: Peter Seiderer <[email protected]> ---- - linux-user/syscall.c | 25 ------------------------- - 1 file changed, 25 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 24b25759be..10af5e0d8e 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -111,31 +111,6 @@ - #define FS_IOC32_SETFLAGS _IOW('f', 2, int) - #define FS_IOC32_GETVERSION _IOR('v', 1, int) - #define FS_IOC32_SETVERSION _IOW('v', 2, int) -- --#define BLKGETSIZE64 _IOR(0x12,114,size_t) --#define BLKDISCARD _IO(0x12,119) --#define BLKIOMIN _IO(0x12,120) --#define BLKIOOPT _IO(0x12,121) --#define BLKALIGNOFF _IO(0x12,122) --#define BLKPBSZGET _IO(0x12,123) --#define BLKDISCARDZEROES _IO(0x12,124) --#define BLKSECDISCARD _IO(0x12,125) --#define BLKROTATIONAL _IO(0x12,126) --#define BLKZEROOUT _IO(0x12,127) -- --#define FIBMAP _IO(0x00,1) --#define FIGETBSZ _IO(0x00,2) -- --struct file_clone_range { -- __s64 src_fd; -- __u64 src_offset; -- __u64 src_length; -- __u64 dest_offset; --}; -- --#define FICLONE _IOW(0x94, 9, int) --#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) -- - #else - #include <linux/fs.h> - #endif --- -2.40.0 -
package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch deleted +0 -82
82 lines not on this page · raw message
package/qemu/qemu.hash +1 -1
@@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b qemu-7.2.1.tar.xz +sha256 bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0 qemu-8.0.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
package/qemu/qemu.mk +2 -3
@@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 7.2.1 +QEMU_VERSION = 8.0.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -302,13 +302,13 @@ define QEMU_CONFIGURE_CMDS --disable-vhost-crypto \ --disable-vhost-user-blk-server \ --disable-virtfs \ - --disable-virtiofsd \ --disable-whpx \ --disable-xen \ --enable-attr \ --enable-kvm \ --enable-vhost-net \ --with-git-submodules=ignore \ + --disable-hexagon-idef-parser \ $(QEMU_OPTS) endef
@@ -474,7 +474,6 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-selinux \ --disable-vde \ --disable-vhost-user-blk-server \ - --disable-virtiofsd \ --disable-vnc-jpeg \ --disable-png \ --disable-vnc-sasl \
Signature · 6 lines
2.34.3 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedRomain, All,
On 2023-04-22 14:32 +0200, Romain Naour spake thusly:
Quoted 29 lines
Changes log:
https://wiki.qemu.org/ChangeLog/8.0Remove upstream patch:
0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch 0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patchRemove --disable-virtiofsd [1]
The "linux-user: fix compat with glibc >= 2.36
sys/mount.h" fix has been reverted, so Qemu expect distros to ship the 2.36 maint release with the fix [2]. So any existing glibc 2.36 based toolchain without the fix will fail again to build qemu.System emulation on 32-bit x86 hosts has been deprecated. The QEMU project no longer considers 32-bit x86 host support for system emulation to be an effective use of its limited resources, and thus intends to discontinue. User mode emulation continues to be supported on 32-bit hosts
Disable Hexagon idef-parser compiler to avoid build issue while building hexagon-linux-user for the target. Indeed idef-parser is a host (native) tool that requires host-glib2, host-flex and host-bison. Keep it disabled for now since hexagon-linux-user build with --disable-hexagon-idef-parser.
Runtime tested in gitlab:
https://gitlab.com/kubu93/buildroot/-/pipelines/845076149
Quoted 6 lines
[1] https://gitlab.com/qemu-project/qemu/-/commit/8ab5e8a503b55eb27672777cfedea902bb22a246
[2] https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e
[3] https://gitlab.com/qemu-project/qemu/-/blob/v8.0.0/target/hexagon/meson.build#L191Signed-off-by Romain Naour <[email protected]>Cc Peter Seiderer <[email protected]>
Applied to master, thanks.
Quoted 233 lines
---
This patch has been rebased onto "package/qemu: bump version to 7.2.1" since we may want to backport host libc-2.37 fix for 2023.02:
http://lists.busybox.net/pipermail/buildroot/2023-April/666598.html--- ...er-add-more-compat-ioctl-definitions.patch | 73 ----------------- ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 5 +- 4 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch delete mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patchpackage/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch deleted +0
-73@@ -1,73 +0,0 @@ -From ba43bb7b641a602081554d7d2a497888209fec2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]> -Date: Tue, 10 Jan 2023 12:49:00 -0500 -Subject: [PATCH 3/4] Revert "linux-user: add more compat ioctl definitions" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. - -glibc has fixed (in 2.36.9000-40-g774058d729) the problem -that caused a clash when both sys/mount.h annd linux/mount.h -are included, and backported this to the 2.36 stable release -too: - - https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -It is saner for QEMU to remove the workaround it applied for -glibc 2.36 and expect distros to ship the 2.36 maint release -with the fix. This avoids needing to add a further workaround -to QEMU to deal with the fact that linux/brtfs.h now also pulls -in linux/mount.h via linux/fs.h since Linux 6.1 - -Signed-off-by: Daniel P. Berrangé <[email protected]> -Reviewed-by: Marc-André Lureau <[email protected]> -Message-Id: <[email protected]> -Signed-off-by: Laurent Vivier <[email protected]> - -[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a] -Signed-off-by: Peter Seiderer <[email protected]> ---- - linux-user/syscall.c | 25 ------------------------- - 1 file changed, 25 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 24b25759be..10af5e0d8e 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -111,31 +111,6 @@ - #define FS_IOC32_SETFLAGS _IOW('f', 2, int) - #define FS_IOC32_GETVERSION _IOR('v', 1, int) - #define FS_IOC32_SETVERSION _IOW('v', 2, int) -- --#define BLKGETSIZE64 _IOR(0x12,114,size_t) --#define BLKDISCARD _IO(0x12,119) --#define BLKIOMIN _IO(0x12,120) --#define BLKIOOPT _IO(0x12,121) --#define BLKALIGNOFF _IO(0x12,122) --#define BLKPBSZGET _IO(0x12,123) --#define BLKDISCARDZEROES _IO(0x12,124) --#define BLKSECDISCARD _IO(0x12,125) --#define BLKROTATIONAL _IO(0x12,126) --#define BLKZEROOUT _IO(0x12,127) -- --#define FIBMAP _IO(0x00,1) --#define FIGETBSZ _IO(0x00,2) -- --struct file_clone_range { -- __s64 src_fd; -- __u64 src_offset; -- __u64 src_length; -- __u64 dest_offset; --}; -- --#define FICLONE _IOW(0x94, 9, int) --#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) -- - #else - #include <linux/fs.h> - #endif --- -2.40.0 -package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch deleted +0
-82@@ -1,82 +0,0 @@ -From ec8b232faefcdd7482c4998e64b78d49d0204502 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]> -Date: Tue, 10 Jan 2023 12:49:01 -0500 -Subject: [PATCH 4/4] Revert "linux-user: fix compat with glibc >= 2.36 - sys/mount.h" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532. - -glibc has fixed (in 2.36.9000-40-g774058d729) the problem -that caused a clash when both sys/mount.h annd linux/mount.h -are included, and backported this to the 2.36 stable release -too: - - https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -It is saner for QEMU to remove the workaround it applied for -glibc 2.36 and expect distros to ship the 2.36 maint release -with the fix. This avoids needing to add a further workaround -to QEMU to deal with the fact that linux/brtfs.h now also pulls -in linux/mount.h via linux/fs.h since Linux 6.1 - -Signed-off-by: Daniel P. Berrangé <[email protected]> -Reviewed-by: Marc-André Lureau <[email protected]> -Message-Id: <[email protected]> -Signed-off-by: Laurent Vivier <[email protected]> - -[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e] -Signed-off-by: Peter Seiderer <[email protected]> ---- - linux-user/syscall.c | 18 ------------------ - meson.build | 2 -- - 2 files changed, 20 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 10af5e0d8e..d974c76b60 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -95,25 +95,7 @@ - #include <linux/soundcard.h> - #include <linux/kd.h> - #include <linux/mtio.h> -- --#ifdef HAVE_SYS_MOUNT_FSCONFIG --/* -- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, -- * which in turn prevents use of linux/fs.h. So we have to -- * define the constants ourselves for now. -- */ --#define FS_IOC_GETFLAGS _IOR('f', 1, long) --#define FS_IOC_SETFLAGS _IOW('f', 2, long) --#define FS_IOC_GETVERSION _IOR('v', 1, long) --#define FS_IOC_SETVERSION _IOW('v', 2, long) --#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) --#define FS_IOC32_GETFLAGS _IOR('f', 1, int) --#define FS_IOC32_SETFLAGS _IOW('f', 2, int) --#define FS_IOC32_GETVERSION _IOR('v', 1, int) --#define FS_IOC32_SETVERSION _IOW('v', 2, int) --#else - #include <linux/fs.h> --#endif - #include <linux/fd.h> - #if defined(CONFIG_FIEMAP) - #include <linux/fiemap.h> -diff --git a/meson.build b/meson.build -index b88867ca9d..39e83bbafe 100644 ---- a/meson.build -+++ b/meson.build -@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET', - cc.has_header_symbol('getopt.h', 'optreset')) - config_host_data.set('HAVE_IPPROTO_MPTCP', - cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) --config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', -- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) - - # has_member - config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', --- -2.40.0 -package/qemu/qemu.hash +1
-1@@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b qemu-7.2.1.tar.xz +sha256 bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0 qemu-8.0.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIBpackage/qemu/qemu.mk +2
-3@@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 7.2.1 +QEMU_VERSION = 8.0.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c@@ -302,13 +302,13 @@ define QEMU_CONFIGURE_CMDS --disable-vhost-crypto \ --disable-vhost-user-blk-server \ --disable-virtfs \ - --disable-virtiofsd \ --disable-whpx \ --disable-xen \ --enable-attr \ --enable-kvm \ --enable-vhost-net \ --with-git-submodules=ignore \ + --disable-hexagon-idef-parser \ $(QEMU_OPTS) endef@@ -474,7 +474,6 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-selinux \ --disable-vde \ --disable-vhost-user-blk-server \ - --disable-virtiofsd \ --disable-vnc-jpeg \ --disable-png \ --disable-vnc-sasl \Signature · 6 lines
2.34.3 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot