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/3] qemu: Update to version 8.1.1 and add libslirp for net
 user backend
Date: Thu, 28 Sep 2023 12:36:59 +0200
Message-ID: <20230928103702.2652442-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3279453889823375896=="
List-Id: <development.lists.ipfire.org>

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

- Update from version 8.0.3 to 8.1.1
- In CU179 the update of qemu caused at least one user to have a problem star=
ting his
   qemu system as the qemu bundled slirp library used for the net user backen=
d was removed
   in version 7.2. Unfortunately no user tested qemu in the CU179 Testing pha=
se, or if they
   did they are not using the net user backend.
- This patch adds the --enable-slirp option to configure and installs libslir=
p in a
   separate patch.
- I can't test if this now works as I don't use qemu anywhere.
- Changelog is too large to include here.
    8.1
	https://wiki.qemu.org/ChangeLog/8.1

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/packages/qemu |  5 +++++
 lfs/qemu                       | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index e69e28322..efc0cbd2e 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -18,7 +18,12 @@ usr/bin/qemu-system-i386
 usr/bin/qemu-system-riscv64
 usr/bin/qemu-system-x86_64
 usr/bin/qemu-x86_64
+#usr/include/fdt.h
+#usr/include/libfdt.h
+#usr/include/libfdt_env.h
 usr/include/qemu-plugin.h
+#usr/lib/libfdt.a
+#usr/lib/pkgconfig/libfdt.pc
 usr/libexec/qemu-bridge-helper
 #usr/share/applications/qemu.desktop
 #usr/share/icons/hicolor/128x128/apps/qemu.png
diff --git a/lfs/qemu b/lfs/qemu
index 8af87e75e..1e46f14a1 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 8.0.3
+VER        =3D 8.1.1
=20
 THISAPP    =3D qemu-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -35,9 +35,9 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D qemu
-PAK_VER    =3D 39
+PAK_VER    =3D 40
=20
-DEPS       =3D alsa elfutils libusbredir spice libseccomp
+DEPS       =3D alsa elfutils libusbredir spice libseccomp libslirp
=20
 SERVICES   =3D
=20
@@ -61,7 +61,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9=
a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
+$(DL_FILE)_BLAKE2 =3D 71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe=
1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340
=20
 install : $(TARGET)
=20
@@ -106,7 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-usb-redir \
 		--enable-seccomp \
 		--disable-docs \
-		--disable-sdl
+		--disable-sdl \
+		--enable-slirp
=20
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
--=20
2.42.0


--===============3279453889823375896==--