Re: [PATCH] libvirt: Update to version 8.9.0

25 Nov 2022

Reviewed-by: Michael Tremer michael.tremer@ipfire.org
...
On 25 Nov 2022, at 08:54, Adolf Belka adolf.belka@ipfire.org wrote:

Update from 7.10.0 to 8.9.0
Update of rootfile
Removal of sheepdog_storage option in ./configure as it has been removed from libvirt
Removal of libvirt-7.10.0-fix-glibc-headers.patch as contents are now built in to source
tarball.
Changelog is too large to include here. Details can be found in the NEWS.rst file in
the source tarball.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/packages/libvirt             | 57 +++++++++++++++++--
lfs/libvirt                                   |  8 +--
.../libvirt-7.10.0-fix-glibc-headers.patch    | 42 --------------
3 files changed, 56 insertions(+), 51 deletions(-)
delete mode 100644 src/patches/libvirt-7.10.0-fix-glibc-headers.patch

diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
index e57ead069..5682b73c8 100644
--- a/config/rootfiles/packages/libvirt
+++ b/config/rootfiles/packages/libvirt
@@ -27,8 +27,13 @@ etc/libvirt/libvirtd.conf
#etc/libvirt/nwfilter/no-other-rarp-traffic.xml
#etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
#etc/libvirt/nwfilter/qemu-announce-self.xml
+etc/libvirt/qemu
etc/libvirt/qemu-lockd.conf
etc/libvirt/qemu.conf
+etc/libvirt/qemu/autostart
+etc/libvirt/secrets
+etc/libvirt/storage
+etc/libvirt/storage/autostart
etc/libvirt/virt-login-shell.conf
etc/libvirt/virtchd.conf
etc/libvirt/virtinterfaced.conf
@@ -53,6 +58,7 @@ usr/bin/virt-host-validate
usr/bin/virt-login-shell
usr/bin/virt-pki-query-dn
usr/bin/virt-pki-validate
+usr/bin/virt-qemu-qmp-proxy
usr/bin/virt-qemu-run
usr/bin/virt-ssh-helper
usr/bin/virt-xml-validate
@@ -78,16 +84,16 @@ usr/bin/virt-xml-validate
#usr/lib/libvirt
#usr/lib/libvirt-admin.so
usr/lib/libvirt-admin.so.0
-usr/lib/libvirt-admin.so.0.7010.0
+usr/lib/libvirt-admin.so.0.8009.0
#usr/lib/libvirt-lxc.so
usr/lib/libvirt-lxc.so.0
-usr/lib/libvirt-lxc.so.0.7010.0
+usr/lib/libvirt-lxc.so.0.8009.0
#usr/lib/libvirt-qemu.so
usr/lib/libvirt-qemu.so.0
-usr/lib/libvirt-qemu.so.0.7010.0
+usr/lib/libvirt-qemu.so.0.8009.0
#usr/lib/libvirt.so
usr/lib/libvirt.so.0
-usr/lib/libvirt.so.0.7010.0
+usr/lib/libvirt.so.0.8009.0
#usr/lib/libvirt/connection-driver
usr/lib/libvirt/connection-driver/libvirt_driver_ch.so
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
@@ -110,6 +116,7 @@ usr/lib/libvirt/storage-file/libvirt_storage_file_fs.so
#usr/lib/pkgconfig/libvirt.pc
#usr/lib/sysctl.d
usr/lib/sysctl.d/60-libvirtd.conf
+usr/lib/sysctl.d/60-qemu-postcopy-migration.conf
usr/libexec/libvirt_iohelper
usr/libexec/virt-login-shell-helper
usr/sbin/libvirtd
@@ -209,14 +216,19 @@ usr/sbin/virtstoraged
usr/share/libvirt/cpu_map/arm_FT-2000plus.xml
usr/share/libvirt/cpu_map/arm_Falkor.xml
usr/share/libvirt/cpu_map/arm_Kunpeng-920.xml
+usr/share/libvirt/cpu_map/arm_Neoverse-N1.xml
+usr/share/libvirt/cpu_map/arm_Neoverse-N2.xml
+usr/share/libvirt/cpu_map/arm_Neoverse-V1.xml
usr/share/libvirt/cpu_map/arm_Tengyun-S2500.xml
usr/share/libvirt/cpu_map/arm_ThunderX299xx.xml
+usr/share/libvirt/cpu_map/arm_a64fx.xml
usr/share/libvirt/cpu_map/arm_cortex-a53.xml
usr/share/libvirt/cpu_map/arm_cortex-a57.xml
usr/share/libvirt/cpu_map/arm_cortex-a72.xml
usr/share/libvirt/cpu_map/arm_features.xml
usr/share/libvirt/cpu_map/arm_vendors.xml
usr/share/libvirt/cpu_map/index.xml
+usr/share/libvirt/cpu_map/ppc64_POWER10.xml
usr/share/libvirt/cpu_map/ppc64_POWER6.xml
usr/share/libvirt/cpu_map/ppc64_POWER7.xml
usr/share/libvirt/cpu_map/ppc64_POWER8.xml
@@ -284,6 +296,32 @@ usr/share/libvirt/cpu_map/x86_phenom.xml
usr/share/libvirt/cpu_map/x86_qemu32.xml
usr/share/libvirt/cpu_map/x86_qemu64.xml
usr/share/libvirt/cpu_map/x86_vendors.xml
+#usr/share/libvirt/schemas
+usr/share/libvirt/schemas/basictypes.rng
+usr/share/libvirt/schemas/capability.rng
+usr/share/libvirt/schemas/cpu.rng
+usr/share/libvirt/schemas/cputypes.rng
+usr/share/libvirt/schemas/domain.rng
+usr/share/libvirt/schemas/domainbackup.rng
+usr/share/libvirt/schemas/domaincaps.rng
+usr/share/libvirt/schemas/domaincheckpoint.rng
+usr/share/libvirt/schemas/domaincommon.rng
+usr/share/libvirt/schemas/domainoverrides.rng
+usr/share/libvirt/schemas/domainsnapshot.rng
+usr/share/libvirt/schemas/inactiveDomain.rng
+usr/share/libvirt/schemas/interface.rng
+usr/share/libvirt/schemas/network.rng
+usr/share/libvirt/schemas/networkcommon.rng
+usr/share/libvirt/schemas/networkport.rng
+usr/share/libvirt/schemas/nodedev.rng
+usr/share/libvirt/schemas/nwfilter.rng
+usr/share/libvirt/schemas/nwfilter_params.rng
+usr/share/libvirt/schemas/nwfilterbinding.rng
+usr/share/libvirt/schemas/secret.rng
+usr/share/libvirt/schemas/storagecommon.rng
+usr/share/libvirt/schemas/storagepool.rng
+usr/share/libvirt/schemas/storagepoolcaps.rng
+usr/share/libvirt/schemas/storagevol.rng
#usr/share/libvirt/test-screenshot.png
#usr/share/locale/as/LC_MESSAGES/libvirt.mo
#usr/share/locale/bg/LC_MESSAGES/libvirt.mo
@@ -300,10 +338,12 @@ usr/share/libvirt/cpu_map/x86_vendors.xml
#usr/share/locale/fr/LC_MESSAGES/libvirt.mo
#usr/share/locale/gu/LC_MESSAGES/libvirt.mo
#usr/share/locale/hi/LC_MESSAGES/libvirt.mo
+#usr/share/locale/hr/LC_MESSAGES/libvirt.mo
#usr/share/locale/hu/LC_MESSAGES/libvirt.mo
#usr/share/locale/id/LC_MESSAGES/libvirt.mo
#usr/share/locale/it/LC_MESSAGES/libvirt.mo
#usr/share/locale/ja/LC_MESSAGES/libvirt.mo
+#usr/share/locale/ka/LC_MESSAGES/libvirt.mo
#usr/share/locale/kn/LC_MESSAGES/libvirt.mo
#usr/share/locale/ko/LC_MESSAGES/libvirt.mo
#usr/share/locale/mk/LC_MESSAGES/libvirt.mo
@@ -340,8 +380,17 @@ var/ipfire/backup/addons/includes/libvirt
#var/lib/libvirt/lockd
#var/lib/libvirt/lockd/files
#var/lib/libvirt/qemu
+#var/lib/libvirt/qemu/channel
+#var/lib/libvirt/qemu/channel/target
+#var/lib/libvirt/qemu/checkpoint
+#var/lib/libvirt/qemu/dump
+#var/lib/libvirt/qemu/nvram
+#var/lib/libvirt/qemu/ram
+#var/lib/libvirt/qemu/save
+#var/lib/libvirt/qemu/snapshot
#var/lib/libvirt/swtpm
#var/log/libvirt
+#var/log/libvirt/ch
#var/log/libvirt/qemu
var/log/swtpm
var/log/swtpm/libvirt
diff --git a/lfs/libvirt b/lfs/libvirt
index 21b06e89b..aa28ef2dc 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -26,7 +26,7 @@ include Config
SUMMARY   = Server side daemon and supporting files for libvirt
-VER        = 7.10.0
+VER        = 8.9.0
THISAPP    = libvirt-$(VER)
DL_FILE    = $(THISAPP).tar.xz
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
TARGET     = $(DIR_INFO)/$(THISAPP)
SUP_ARCH   = x86_64 aarch64
PROG       = libvirt
-PAK_VER    = 29
+PAK_VER    = 30
DEPS       = ebtables libpciaccess libtirpc libyajl ncat qemu
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb
+$(DL_FILE)_BLAKE2 = 537b6badb6171110e99561613fb1318144991107139401296248afb747ae6f9cfafcd17b2292b8d8dcc9188ff4206035ea814efa6c129bae50c0518f61be9b81
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -83,7 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch

cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libvirt-7.10.0-fix-glibc-headers.patch

cd $(DIR_APP) && meson \
--prefix=/usr \
@@ -112,7 +111,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-D storage_mpath=disabled \
-D storage_disk=disabled \
-D storage_rbd=disabled \

-D storage_sheepdog=disabled \

-D storage_gluster=disabled \
-D storage_zfs=disabled \
builddir/
diff --git a/src/patches/libvirt-7.10.0-fix-glibc-headers.patch b/src/patches/libvirt-7.10.0-fix-glibc-headers.patch
deleted file mode 100644
index cfe71d4bd..000000000
--- a/src/patches/libvirt-7.10.0-fix-glibc-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
-From: Cole Robinson crobinso@redhat.com
-Date: Mon, 1 Aug 2022 15:24:01 -0400
-Subject: [PATCH] virfile: Fix build with glibc 2.36



-With glibc 2.36, sys/mount.h and linux/mount.h conflict:
-https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3...



-virfile.c imports sys/mount.h and linux/fs.h, which pulls in
-linux/mount.h.



-Manually define the constants we need from linux/fs.h, like was
-done in llvm:



-https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02



-Reviewed-by: Erik Skultety eskultet@redhat.com
-Signed-off-by: Cole Robinson crobinso@redhat.com

src/util/virfile.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)


-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 99da058db3..ce541b8946 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -71,7 +71,11 @@

# endif
# include <sys/ioctl.h>
# include <linux/cdrom.h>

--# include <linux/fs.h>
-+/* These come from linux/fs.h, but that header conflicts with
-+ * sys/mount.h on glibc 2.36+ */
-+# define FS_IOC_GETFLAGS _IOR('f', 1, long)
-+# define FS_IOC_SETFLAGS _IOW('f', 2, long)
-+# define FS_NOCOW_FL 0x00800000

#endif

#if WITH_LIBATTR


-GitLab



-- 
2.38.1

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Re: [PATCH] libvirt: Update to version 8.9.0

Signed-off-by: Adolf Belka adolf.belka@ipfire.org

-Signed-off-by: Cole Robinson crobinso@redhat.com