Merge branch 'master' into next

diff --git a/config/rootfiles/packages/libslirp b/config/rootfiles/packages/libslirp
new file mode 100644 (file)
index 0000000..b50dad1
--- /dev/null
+++ b/config/rootfiles/packages/libslirp
@@ -0,0 +1,7 @@
+#usr/include/slirp
+#usr/include/slirp/libslirp-version.h
+#usr/include/slirp/libslirp.h
+#usr/lib/libslirp.so
+usr/lib/libslirp.so.0
+usr/lib/libslirp.so.0.4.0
+#usr/lib/pkgconfig/slirp.pc

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index e69e28322ca107de5ef71898e2ac03c3a6f0cadf..efc0cbd2e33e4b48e63f909a0ba929d2bce96e6f 100644 (file)
--- 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/libslirp b/lfs/libslirp
new file mode 100644 (file)
index 0000000..cdbb798
--- /dev/null
+++ b/lfs/libslirp
@@ -0,0 +1,92 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2023  IPFire Team  <info@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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+SUMMARY    = A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services.
+
+
+VER        = 4.7.0
+
+THISAPP    = libslirp-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libslirp
+PAK_VER    = 1
+
+DEPS       =
+
+SERVICES   =
+
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = ccea2413c1dc6148e80851496955d5a991f37e359dc30946fd901627ce5d100b4ea065189b87dd79f574f15cac0e7468063d347efac9251f7180d3d291b1b2e5
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && meson          --prefix=/usr \
+                                       builddir/
+       cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+       cd $(DIR_APP) && ninja -C builddir/ install
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/qemu b/lfs/qemu
index 8af87e75e890b8b313bf28a43892984ec569c91c..1e46f14a1abba2f431cf653fe89e126ae20d3e7e 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        = 8.0.3
+VER        = 8.1.1
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,9 +35,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu
-PAK_VER    = 39
+PAK_VER    = 40
 
-DEPS       = alsa elfutils libusbredir spice libseccomp
+DEPS       = alsa elfutils libusbredir spice libseccomp libslirp
 
 SERVICES   =
 
@@ -61,7 +61,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
+$(DL_FILE)_BLAKE2 = 71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340
 
 install : $(TARGET)
 
@@ -106,7 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-usb-redir \
                --enable-seccomp \
                --disable-docs \
-               --disable-sdl
+               --disable-sdl \
+               --enable-slirp
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/lfs/qemu-ga b/lfs/qemu-ga
index db5bf8db8719e3d40fa51d60c36304a1c873d2a0..b05f43a76879f4a3dd7b4845f0218b985aca14e9 100644 (file)
--- a/lfs/qemu-ga
+++ b/lfs/qemu-ga
@@ -26,11 +26,11 @@ include Config
 
 SUMMARY    = Guest agent for QEMU
 
-VER        = 8.0.3
+VER        = 8.1.1
 THISAPP    = qemu-ga-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu-ga
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       =
 

diff --git a/make.sh b/make.sh
index 1a948f8dd2e8aab3475b5413b0b46c4105a68f96..e8aae4cf08b3bbeeb8526441ab1b7f96da21284d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1494,6 +1494,7 @@ buildipfire() {
   lfsmake2 sdl2
   lfsmake2 libusbredir
   lfsmake2 libseccomp
+  lfsmake2 libslirp
   lfsmake2 qemu
   lfsmake2 netsnmpd
   lfsmake2 nagios_nrpe