* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a98abe9290a7267b4258ab21e7fd735f48024d88
@ 2023-09-28 10:43 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2023-09-28 10:43 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 10916 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via a98abe9290a7267b4258ab21e7fd735f48024d88 (commit)
via 89604acef2a862d6098a90f93a04bfe03e6843f9 (commit)
via a38402929e5c0c91fa14fe6c347bef9796099e8a (commit)
from 4322d0c7276f305db3bcf4f09889cb828e54b514 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a98abe9290a7267b4258ab21e7fd735f48024d88
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Sep 28 12:37:01 2023 +0200
libslirp: Add the slirp library as this is required for the net user backend in qemu
- Looking through some of the changelog and some mail list communications it looks like
qemu decided they did noty want to maintain their own bundled version of libslirp when
the majority of OS's had their own version now in place. Ubuntu 18.04 did not have
libslirp but qemu stopped supporting that version from qemu-7.1
- So it looks like all OS's have a standard libslirp available now and qemu have taken
the decision to no longer have their own version but to use the system version. That
was always possible to do if use of the system version was explicitly defined but
the default was to use the bundled version.
- No evidence that libslirp is deprecated.
- The last version of libslirp was released a year ago but it looks like every month or
so there are a couple of commits merged. The last was a month ago.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 89604acef2a862d6098a90f93a04bfe03e6843f9
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Sep 28 12:37:00 2023 +0200
qemu-ga: Update to version 8.1.1
- Update from version 8.0.3 to 8.1.1
- Update of rootfile not required
- Changelog
8.1
https://wiki.qemu.org/ChangeLog/8.1
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a38402929e5c0c91fa14fe6c347bef9796099e8a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Sep 28 12:36:59 2023 +0200
qemu: Update to version 8.1.1 and add libslirp for net user backend
- 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 starting his
qemu system as the qemu bundled slirp library used for the net user backend was removed
in version 7.2. Unfortunately no user tested qemu in the CU179 Testing phase, or if they
did they are not using the net user backend.
- This patch adds the --enable-slirp option to configure and installs libslirp 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>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/libslirp | 7 +++++++
config/rootfiles/packages/qemu | 5 +++++
lfs/{libusbredir => libslirp} | 18 +++++++++++-------
lfs/qemu | 11 ++++++-----
lfs/qemu-ga | 4 ++--
make.sh | 1 +
6 files changed, 32 insertions(+), 14 deletions(-)
create mode 100644 config/rootfiles/packages/libslirp
copy lfs/{libusbredir => libslirp} (88%)
Difference in files:
diff --git a/config/rootfiles/packages/libslirp b/config/rootfiles/packages/libslirp
new file mode 100644
index 000000000..b50dad1ef
--- /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 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/libslirp b/lfs/libslirp
new file mode 100644
index 000000000..cdbb7981f
--- /dev/null
+++ b/lfs/libslirp
@@ -0,0 +1,92 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2023 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 #
+# 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 8af87e75e..1e46f14a1 100644
--- 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 db5bf8db8..b05f43a76 100644
--- 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 acb692140..7cab222af 100755
--- 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
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-09-28 10:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-28 10:43 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a98abe9290a7267b4258ab21e7fd735f48024d88 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox