]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
qemu: Update to version 7.1.0
authorAdolf Belka <adolf.belka@ipfire.org>
Fri, 25 Nov 2022 08:54:59 +0000 (09:54 +0100)
committerPeter Müller <peter.mueller@ipfire.org>
Fri, 25 Nov 2022 11:58:58 +0000 (11:58 +0000)
- Update from 7.0.0 to 7.1.0
- Update of rootfile not required
- Removal of qemu-7.0.0-fix-glibc-headers.patch as an alternative patch approach has been
   implemeted into thye source tarball.
- Changelog is too large to include here. Details can be found at
   https://wiki.qemu.org/ChangeLog/7.1

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/qemu
src/patches/qemu-7.0.0-fix-glibc-headers.patch [deleted file]

index 7f1ab78965cc964ef40e9f0bee27f793194920cc..02f1e7b7919735a9d11b19ed41b635fbac5e89ee 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -27,7 +27,7 @@ include Config
 SUMMARY    = Machine emulator and virtualizer
 
 # If you update the version also qemu-ga !!!
-VER        = 7.0.0
+VER        = 7.1.0
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu
-PAK_VER    = 35
+PAK_VER    = 36
 
 DEPS       = alsa libusbredir spice libseccomp
 
@@ -61,7 +61,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68
+$(DL_FILE)_BLAKE2 = e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf
 
 install : $(TARGET)
 
@@ -94,7 +94,6 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-7.0.0-fix-glibc-headers.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \
diff --git a/src/patches/qemu-7.0.0-fix-glibc-headers.patch b/src/patches/qemu-7.0.0-fix-glibc-headers.patch
deleted file mode 100644 (file)
index 9332563..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu-7.0.0/linux-user/syscall.c~   2022-08-10 14:03:50.721401251 +0000
-+++ qemu-7.0.0/linux-user/syscall.c    2022-08-10 14:00:22.569951783 +0000
-@@ -28,7 +28,7 @@
- #include <sys/ipc.h>
- #include <sys/msg.h>
- #include <sys/wait.h>
--#include <sys/mount.h>
-+#include <linux/mount.h>
- #include <sys/file.h>
- #include <sys/fsuid.h>
- #include <sys/personality.h>