[PATCH 1/3] qemu: Update to version 9.2.0

[PATCH 1/3] qemu: Update to version 9.2.0

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 3570 bytes --]

- Update from version 9.0.2 to 9.2.0
- Update of rootfile
- Changelog
    9.2.0
	https://wiki.qemu.org/ChangeLog/9.2
    9.1.0
	https://wiki.qemu.org/ChangeLog/9.1

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

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 542627771..49105c523 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -13,6 +13,7 @@ usr/bin/qemu-storage-daemon
 usr/bin/qemu-system-aarch64
 usr/bin/qemu-system-riscv64
 usr/bin/qemu-system-x86_64
+usr/bin/qemu-vmsr-helper
 usr/bin/qemu-x86_64
 usr/include/qemu-plugin.h
 usr/libexec/qemu-bridge-helper
@@ -56,6 +57,10 @@ usr/share/qemu/edk2-i386-code.fd
 usr/share/qemu/edk2-i386-secure-code.fd
 usr/share/qemu/edk2-i386-vars.fd
 usr/share/qemu/edk2-licenses.txt
+usr/share/qemu/edk2-loongarch64-code.fd
+usr/share/qemu/edk2-loongarch64-vars.fd
+usr/share/qemu/edk2-riscv-code.fd
+usr/share/qemu/edk2-riscv-vars.fd
 usr/share/qemu/edk2-x86_64-code.fd
 usr/share/qemu/edk2-x86_64-secure-code.fd
 usr/share/qemu/efi-e1000.rom
@@ -72,6 +77,7 @@ usr/share/qemu/firmware/50-edk2-x86_64-secure.json
 usr/share/qemu/firmware/60-edk2-aarch64.json
 usr/share/qemu/firmware/60-edk2-arm.json
 usr/share/qemu/firmware/60-edk2-i386.json
+usr/share/qemu/firmware/60-edk2-loongarch64.json
 usr/share/qemu/firmware/60-edk2-x86_64.json
 #usr/share/qemu/hppa-firmware.img
 #usr/share/qemu/hppa-firmware64.img
@@ -135,7 +141,6 @@ usr/share/qemu/qboot.rom
 usr/share/qemu/qemu-nsis.bmp
 usr/share/qemu/qemu_vga.ndrv
 #usr/share/qemu/s390-ccw.img
-#usr/share/qemu/s390-netboot.img
 #usr/share/qemu/skiboot.lid
 #usr/share/qemu/slof.bin
 usr/share/qemu/trace-events-all
diff --git a/lfs/qemu b/lfs/qemu
index 0fd91651f..cf0d3aa0c 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -27,7 +27,7 @@ include Config
 SUMMARY    = Machine emulator and virtualizer
 
 # If you update the version also qemu-ga !!!
-VER        = 9.0.2
+VER        = 9.2.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    = 44
+PAK_VER    = 45
 
 DEPS       = alsa libusbredir spice libseccomp libslirp
 
@@ -57,7 +57,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 6b5301f985919ae53e056410be7486b8150a65016127568bd4d58f596e94960d08eb3fc57cff7ff6a3435d71274adee516f57375d856d61b4fc7a3f24cbf75c4
+$(DL_FILE)_BLAKE2 = 5800556f356e4324124e250c02a07857eef3a6f22995a819fe972061fa750ebf7233da64ae4c0a3e775b1639c870be4b7312d86d9866fedf2bc99074aad0a10a
 
 install : $(TARGET)
 
-- 
2.47.1

[PATCH 2/3] qemu-ga: Update to version 9.2.0

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1337 bytes --]

- Update from version 9.0.2 to 9.2.0
- Update of rootfile not required
- Changelog same as in the commit for qemu to 9.2.0

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/qemu-ga | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lfs/qemu-ga b/lfs/qemu-ga
index 862417530..6416da061 100644
--- a/lfs/qemu-ga
+++ b/lfs/qemu-ga
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,11 +26,11 @@ include Config
 
 SUMMARY    = Guest agent for QEMU
 
-VER        = 9.0.2
+VER        = 9.2.0
 THISAPP    = qemu-ga-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu-ga
-PAK_VER    = 9
+PAK_VER    = 10
 
 DEPS       =
 
-- 
2.47.1

[PATCH 3/3] make.sh: Move python3-tomli to before qemu as it is now needed for the build

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index 84b00f9ad..98be6ab1c 100755
--- a/make.sh
+++ b/make.sh
@@ -1870,6 +1870,7 @@ build_system() {
 	lfsmake2 libseccomp
 	lfsmake2 libslirp
 	lfsmake2 dtc
+	lfsmake2 python3-tomli
 	lfsmake2 qemu
 	lfsmake2 netsnmpd
 	lfsmake2 nagios_nrpe
@@ -1937,7 +1938,6 @@ build_system() {
 	lfsmake2 python3-certifi
 	lfsmake2 python3-idna
 	lfsmake2 python3-requests
-	lfsmake2 python3-tomli
 	lfsmake2 python3-pep517
 	lfsmake2 python3-build
 	lfsmake2 python3-install
-- 
2.47.1