From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] qemu: Update to version 7.1.0
Date: Fri, 25 Nov 2022 09:54:59 +0100
Message-ID: <20221125085500.1897-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4217193143375165196=="
List-Id: <development.lists.ipfire.org>

--===============4217193143375165196==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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 appro=
ach 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(a)ipfire.org>
---
 lfs/qemu                                       |  7 +++----
 src/patches/qemu-7.0.0-fix-glibc-headers.patch | 11 -----------
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 src/patches/qemu-7.0.0-fix-glibc-headers.patch

diff --git a/lfs/qemu b/lfs/qemu
index 7f1ab7896..02f1e7b79 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -27,7 +27,7 @@ include Config
 SUMMARY    =3D Machine emulator and virtualizer
=20
 # If you update the version also qemu-ga !!!
-VER        =3D 7.0.0
+VER        =3D 7.1.0
=20
 THISAPP    =3D qemu-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D qemu
-PAK_VER    =3D 35
+PAK_VER    =3D 36
=20
 DEPS       =3D alsa libusbredir spice libseccomp
=20
@@ -61,7 +61,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68=
a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68
+$(DL_FILE)_BLAKE2 =3D e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730=
ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf
=20
 install : $(TARGET)
=20
@@ -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-h=
eaders.patch
 	cd $(DIR_APP) && ./configure \
 		--prefix=3D/usr \
 		--sysconfdir=3D/etc \
diff --git a/src/patches/qemu-7.0.0-fix-glibc-headers.patch b/src/patches/qem=
u-7.0.0-fix-glibc-headers.patch
deleted file mode 100644
index 9332563bc..000000000
--- a/src/patches/qemu-7.0.0-fix-glibc-headers.patch
+++ /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>
--=20
2.38.1


--===============4217193143375165196==--