[packages/qemu] - up to 10.0.0, todo: package new files

baggins baggins at pld-linux.org
Tue May 27 06:41:20 CEST 2025 

commit 0cf97d1b05e056522eeaabbbfbc8f112ecf20eb4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 27 07:12:12 2025 +0200

    - up to 10.0.0, todo: package new files

 glibc2.41.patch        | 50 ----------------------------------
 qemu-cflags.patch      |  2 +-
 qemu-user-execve.patch |  2 +-
 qemu-xattr.patch       | 23 ----------------
 qemu.spec              | 73 ++++++--------------------------------------------
 5 files changed, 10 insertions(+), 140 deletions(-)
---
diff --git a/qemu.spec b/qemu.spec
index 65503eb..a882f74 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -44,12 +44,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	8.2.7
-Release:	1
+Version:	10.0.0
+Release:	0.1
 License:	GPL v2, BSD (edk2 firmware files)
 Group:		Applications/Emulators
 Source0:	https://download.qemu.org/%{name}-%{version}.tar.xz
-# Source0-md5:	f3602805fa1e80fd7b9b82fd2d6080a2
+# Source0-md5:	0616ad4c49210ae33ca7aeb5091cb4e0
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
 # Creates /dev/kvm
@@ -69,13 +69,11 @@ Source15:	%{name}-pr-helper.service
 Source16:	%{name}-pr-helper.socket
 Patch0:		%{name}-cflags.patch
 Patch1:		%{name}-user-execve.patch
-Patch2:		%{name}-xattr.patch
 Patch3:		libjpeg-boolean.patch
 Patch5:		%{name}-u2f-emu.patch
 Patch6:		%{name}-linux-mount.patch
 Patch7:		libvfio-user-types.patch
 Patch8:		libvfio-user-alloca.patch
-Patch9:		glibc2.41.patch
 URL:		https://www.qemu.org/
 %{?with_opengl:BuildRequires:	Mesa-libgbm-devel}
 %{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
@@ -200,12 +198,10 @@ Requires:	%{name}-system-aarch64 = %{version}-%{release}
 Requires:	%{name}-system-alpha = %{version}-%{release}
 Requires:	%{name}-system-arm = %{version}-%{release}
 Requires:	%{name}-system-avr = %{version}-%{release}
-Requires:	%{name}-system-cris = %{version}-%{release}
 Requires:	%{name}-system-hppa = %{version}-%{release}
 Requires:	%{name}-system-m68k = %{version}-%{release}
 Requires:	%{name}-system-microblaze = %{version}-%{release}
 Requires:	%{name}-system-mips = %{version}-%{release}
-Requires:	%{name}-system-nios2 = %{version}-%{release}
 Requires:	%{name}-system-or1k = %{version}-%{release}
 Requires:	%{name}-system-ppc = %{version}-%{release}
 Requires:	%{name}-system-riscv32 = %{version}-%{release}
@@ -249,6 +245,9 @@ Requires:	usbredir >= 0.6 \
 %define		_noautostrip	.*%{_datadir}/qemu/.*
 %define		_noautochrpath	.*%{_datadir}/qemu/.*
 
+# include/qemu/osdep.h:290: #error building with NDEBUG is not supported
+%define		filterout	-DNDEBUG
+
 %description
 QEMU is a FAST! processor emulator. By using dynamic translation it
 achieves a reasonnable speed while being easy to port on new host
@@ -319,6 +318,8 @@ Obsoletes:	qemu-module-block-archipelago < 2.9.0
 Obsoletes:	qemu-system-lm32 < 5.2
 Obsoletes:	qemu-system-moxie < 6.1
 Obsoletes:	qemu-system-unicore32 < 5.2
+Obsoletes:	qemu-system-cris < 10.0.0
+Obsoletes:	qemu-system-nios2 < 10.0.0
 Conflicts:	qemu < 1.0-2
 
 %description common
@@ -471,26 +472,6 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem AVR.
 
-%package system-cris
-Summary:	QEMU system emulator for CRIS
-Summary(pl.UTF-8):	QEMU - emulator systemu z procesorem CRIS
-Group:		Applications/Emulators
-Requires:	%{name}-common = %{version}-%{release}
-%systempkg_req
-Obsoletes:	qemu-kvm-system-cris < 2
-
-%description system-cris
-QEMU is a generic and open source processor emulator which achieves a
-good emulation speed by using dynamic translation.
-
-This package provides the system emulator with CRIS CPU.
-
-%description system-cris -l pl.UTF-8
-QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
-dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
-
-Ten pakiet zawiera emulator systemu z procesorem CRIS.
-
 %package system-hppa
 Summary:	QEMU system emulator for HP/PA
 Summary(pl.UTF-8):	QEMU - emulator systemu z procesorem HP/PA
@@ -572,25 +553,6 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem MIPS.
 
-%package system-nios2
-Summary:	QEMU system emulator for Nios II
-Summary(pl.UTF-8):	QEMU - emulator systemu z procesorem Nios II
-Group:		Applications/Emulators
-Requires:	%{name}-common = %{version}-%{release}
-%systempkg_req
-
-%description system-nios2
-QEMU is a generic and open source processor emulator which achieves a
-good emulation speed by using dynamic translation.
-
-This package provides the system emulator with Nios II CPU.
-
-%description system-nios2 -l pl.UTF-8
-QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
-dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
-
-Ten pakiet zawiera emulator systemu z procesorem Nios II.
-
 %package system-or1k
 Summary:	QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):	QEMU - emulator systemu z procesorem OpenRISC
@@ -1035,13 +997,11 @@ Pliki nagłówkowe biblioteki vfio-user.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
-%patch -P2 -p1
 %patch -P3 -p1
 %patch -P5 -p1
 %patch -P6 -p1
 %patch -P7 -p1
 %patch -P8 -p1
-%patch -P9 -p1
 
 %{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap
 
@@ -1406,14 +1366,11 @@ fi
 %if %{with virgl}
 %attr(755,root,root) %{_libexecdir}/vhost-user-gpu
 %endif
-%attr(755,root,root) %{_libexecdir}/virtfs-proxy-helper
 %dir %{_libdir}/%{name}
 # modules without too many external dependencies
 %attr(755,root,root) %{_libdir}/%{name}/block-blkio.so
 %attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so
 %attr(755,root,root) %{_libdir}/%{name}/block-dmg-lzfse.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-tcg-i386.so
-%attr(755,root,root) %{_libdir}/%{name}/accel-tcg-x86_64.so
 %attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so
 %if %{with oss}
 %attr(755,root,root) %{_libdir}/%{name}/audio-oss.so
@@ -1464,7 +1421,6 @@ fi
 %{_iconsdir}/hicolor/scalable/apps/qemu.svg
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/qemu-storage-daemon.1*
-%{_mandir}/man1/virtfs-proxy-helper.1*
 %{_mandir}/man7/qemu-block-drivers.7*
 %{_mandir}/man7/qemu-cpu-models.7*
 %{_mandir}/man7/qemu-qmp-ref.7*
@@ -1486,7 +1442,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-alpha
 %attr(755,root,root) %{_bindir}/qemu-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
-%attr(755,root,root) %{_bindir}/qemu-cris
 %attr(755,root,root) %{_bindir}/qemu-hexagon
 %attr(755,root,root) %{_bindir}/qemu-hppa
 %attr(755,root,root) %{_bindir}/qemu-i386
@@ -1501,7 +1456,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mips64el
 %attr(755,root,root) %{_bindir}/qemu-mipsn32
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el
-%attr(755,root,root) %{_bindir}/qemu-nios2
 %attr(755,root,root) %{_bindir}/qemu-or1k
 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64
@@ -1527,7 +1481,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-alpha-static
 %attr(755,root,root) %{_bindir}/qemu-arm-static
 %attr(755,root,root) %{_bindir}/qemu-armeb-static
-%attr(755,root,root) %{_bindir}/qemu-cris-static
 %attr(755,root,root) %{_bindir}/qemu-hexagon-static
 %attr(755,root,root) %{_bindir}/qemu-hppa-static
 %attr(755,root,root) %{_bindir}/qemu-i386-static
@@ -1541,7 +1494,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mipsel-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el-static
-%attr(755,root,root) %{_bindir}/qemu-nios2-static
 %attr(755,root,root) %{_bindir}/qemu-or1k-static
 %attr(755,root,root) %{_bindir}/qemu-ppc-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64-static
@@ -1583,10 +1535,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-avr
 
-%files system-cris
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/qemu-system-cris
-
 %files system-hppa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-hppa
@@ -1609,10 +1557,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-system-mips64
 %attr(755,root,root) %{_bindir}/qemu-system-mips64el
 
-%files system-nios2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/qemu-system-nios2
-
 %files system-or1k
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-or1k
@@ -1652,7 +1596,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x
 %{_datadir}/%{name}/s390-ccw.img
-%{_datadir}/%{name}/s390-netboot.img
 
 %files system-sh4
 %defattr(644,root,root,755)
diff --git a/glibc2.41.patch b/glibc2.41.patch
deleted file mode 100644
index 58dffb8..0000000
--- a/glibc2.41.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 27a8d899c7a100fd5aa040a8b993bb257687c393 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Fri, 7 Feb 2025 16:09:20 +0000
-Subject: [PATCH] linux-user: Do not define struct sched_attr if libc headers
- do
-
-glibc 2.41+ has added [1] definitions for sched_setattr and
-sched_getattr functions and struct sched_attr.  Therefore, it needs
-to be checked for here as well before defining sched_attr, to avoid
-a compilation failure.
-
-Define sched_attr conditionally only when SCHED_ATTR_SIZE_VER0 is
-not defined.
-
-[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2799
-Cc: qemu-stable at nongnu.org
-Reviewed-by: Peter Maydell <peter.maydell at linaro.org>
-Signed-off-by: Peter Maydell <peter.maydell at linaro.org>
----
- linux-user/syscall.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 6ee02383daf..df5ed18062c 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -360,7 +360,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
- #define __NR_sys_sched_setaffinity __NR_sched_setaffinity
- _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
-           unsigned long *, user_mask_ptr);
--/* sched_attr is not defined in glibc */
-+/* sched_attr is not defined in glibc < 2.41 */
-+#ifndef SCHED_ATTR_SIZE_VER0
- struct sched_attr {
-     uint32_t size;
-     uint32_t sched_policy;
-@@ -373,6 +374,7 @@ struct sched_attr {
-     uint32_t sched_util_min;
-     uint32_t sched_util_max;
- };
-+#endif
- #define __NR_sys_sched_getattr __NR_sched_getattr
- _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
-           unsigned int, size, unsigned int, flags);
--- 
-GitLab
-
diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index a2d165f..3de8f4a 100644
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -9,5 +9,5 @@
 -#endif
 -
  #include "config-host.h"
- #ifdef NEED_CPU_H
+ #ifdef COMPILING_PER_TARGET
  #include CONFIG_TARGET
diff --git a/qemu-user-execve.patch b/qemu-user-execve.patch
index 3a3188e..56133f3 100644
--- a/qemu-user-execve.patch
+++ b/qemu-user-execve.patch
@@ -77,7 +77,7 @@ index ee12035..5951279 100644
 +     "path",       "use interpreter at 'path' when a process calls execve()"},
      {"R",          "QEMU_RESERVED_VA", true,  handle_arg_reserved_va,
       "size",       "reserve 'size' bytes for guest virtual address space"},
-     {"d",          "QEMU_LOG",         true,  handle_arg_log,
+     {"t",          "QEMU_RTSIG_MAP",   true,  handle_arg_rtsig_map,
 --- qemu-6.2.0/linux-user/user-internals.h.orig
 +++ qemu-6.2.0/linux-user/user-internals.h
 @@ -28,6 +28,7 @@ void init_task_state(TaskState *ts);
diff --git a/qemu-xattr.patch b/qemu-xattr.patch
deleted file mode 100644
index a031ad6..0000000
--- a/qemu-xattr.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Workaround <linux/xattr.h> vs <sys/xattr.h> defines conflict:
-When including both, the latter must be included first.
-Move "qemu-xattr.h" (which includes <sys/xattr.h> to the front,
-before <sys/capability.h> (which includes <linux/xattr.h>.
-
---- qemu-7.2.10/fsdev/virtfs-proxy-helper.c.orig	2024-03-25 22:16:49.552502269 +0100
-+++ qemu-7.2.10/fsdev/virtfs-proxy-helper.c	2024-03-25 22:36:50.349330328 +0100
-@@ -10,6 +10,7 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "qemu/xattr.h"
- #include <glib/gstdio.h>
- #include <sys/resource.h>
- #include <getopt.h>
-@@ -23,7 +24,6 @@
- #endif
- #include <cap-ng.h>
- #include "qemu/sockets.h"
--#include "qemu/xattr.h"
- #include "9p-iov-marshal.h"
- #include "hw/9pfs/9p-proxy.h"
- #include "hw/9pfs/9p-util.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qemu.git/commitdiff/0cf97d1b05e056522eeaabbbfbc8f112ecf20eb4

More information about the pld-cvs-commit mailing list