Thanks, applied as 5a10ad5ee605fd8cf97434c2b5aecf4c94886d6e. Michael
[sent from post-receive hook] On Fri, 07 Mar 2025 10:49:45 +0100, Christian Melki <[email protected]> wrote: > Minor bugfix release. > https://github.com/qemu/qemu/compare/v9.2.1...v9.2.2 > > Should be included ASAP as the QEMU folks seem > to have botched the 9.2.1 tarball. > The current hash of 9.2.1 is not valid any more. > The tarball has been replaced. A packaging issue > seems to have left a bunch of rust stuff in the old tarball. > > * Regenerate patches. glibc 2.41 patch now included in the release. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/qemu-9.2.1/0050-sched_attr-Do-not-define-for-glibc-2.41.patch > b/patches/qemu-9.2.1/0050-sched_attr-Do-not-define-for-glibc-2.41.patch > deleted file mode 100644 > index 056f680edb1c..000000000000 > --- a/patches/qemu-9.2.1/0050-sched_attr-Do-not-define-for-glibc-2.41.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From: Khem Raj <[email protected]> > -Date: Fri, 11 Oct 2024 12:31:40 -0700 > -Subject: [PATCH] sched_attr: Do not define for glibc >= 2.41 > - > -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 > - > -Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0 > - > -Fixes builds with glibc/trunk > - > -[1] > https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8 > - > -Signed-off-by: Khem Raj <[email protected]> > -Cc: Laurent Vivier <[email protected]> > -Cc: Paolo Bonzini <[email protected]> > ---- > - 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 1ce4c79784f0..a407d4a023e5 100644 > ---- a/linux-user/syscall.c > -+++ b/linux-user/syscall.c > -@@ -358,7 +358,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; > -@@ -371,6 +372,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); > diff --git > a/patches/qemu-9.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > > b/patches/qemu-9.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > similarity index 100% > rename from > patches/qemu-9.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > rename to > patches/qemu-9.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > diff --git a/patches/qemu-9.2.1/series b/patches/qemu-9.2.2/series > similarity index 56% > rename from patches/qemu-9.2.1/series > rename to patches/qemu-9.2.2/series > index f5ee289e6272..a55ede383bcd 100644 > --- a/patches/qemu-9.2.1/series > +++ b/patches/qemu-9.2.2/series > @@ -1,8 +1,6 @@ > # generated by git-ptx-patches > #tag:base --start-number 1 > #tag:upstream --start-number 1 > -#tag:fixes --start-number 50 > -0050-sched_attr-Do-not-define-for-glibc-2.41.patch > #tag:ptxdist --start-number 100 > 0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > -# 44fe44b2235aafe20131f1d915fe388c - git-ptx-patches magic > +# 7c1abd8b5f5ef26378050b669cba203a - git-ptx-patches magic > diff --git a/rules/qemu.make b/rules/qemu.make > index 504453143a43..a3c0b3d9f286 100644 > --- a/rules/qemu.make > +++ b/rules/qemu.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu > # > # Paths and names > # > -QEMU_VERSION := 9.2.1 > -QEMU_MD5 := c33f4ef002f3d8d73f07079c9b4a157b > +QEMU_VERSION := 9.2.2 > +QEMU_MD5 := 417dc130a89238ba5347ced224497ee1 > QEMU := qemu-$(QEMU_VERSION) > QEMU_SUFFIX := tar.xz > QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
