[arch-commits] Commit in qemu/trunk (qemu-7.0.0-glibc-2.36.patch)
David Runge
dvzrv at gemini.archlinux.org
Fri Sep 2 22:03:17 UTC 2022
Date: Friday, September 2, 2022 @ 22:03:16
Author: dvzrv
Revision: 454977
upgpkg: qemu 7.1.0-1: Upgrade to 7.1.0.
Remove unneeded patches.
Build binaries for qemu-user-static.
Remove preventing of stripping the qemu-system packages, which reduces their size and hopefully does not harm the vendored blobs.
Add qemu-system-loongarch64 for LoonArch64 support.
Deleted:
qemu/trunk/qemu-7.0.0-glibc-2.36.patch
-----------------------------+
qemu-7.0.0-glibc-2.36.patch | 43 ------------------------------------------
1 file changed, 43 deletions(-)
Deleted: qemu-7.0.0-glibc-2.36.patch
===================================================================
--- qemu-7.0.0-glibc-2.36.patch 2022-09-02 22:00:15 UTC (rev 454976)
+++ qemu-7.0.0-glibc-2.36.patch 2022-09-02 22:03:16 UTC (rev 454977)
@@ -1,43 +0,0 @@
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index b27a6552aa..52d178afe7 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,7 +95,25 @@
- #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 294e9a8f32..30a380752c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1963,6 +1963,8 @@ 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',
More information about the arch-commits
mailing list