Early spring clean: Remove trailing whitespaces, and correct licence headers

[ipfire-2.x.git] / lfs / libvirt

diff --git a/lfs/libvirt b/lfs/libvirt
index b680cbb3d66678b820fe1f578c174cbea02e881f..658b05cb17b1cd8cd6f7ceabe8bec134a4cbb07d 100644 (file)
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  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        #
@@ -24,19 +24,23 @@
 
 include Config
 
-VER        = 6.5.0
+SUMMARY           = Server side daemon and supporting files for libvirt
+
+VER        = 7.10.0
 
 THISAPP    = libvirt-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586 x86_64
+SUP_ARCH   = x86_64 aarch64
 PROG       = libvirt
-PAK_VER    = 26
+PAK_VER    = 28
 
 DEPS       = ebtables libpciaccess libtirpc libyajl ncat qemu
 
+SERVICES   = libvirtd virtlogd
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -45,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 19ea5c0d18bed1515c23a9e9c7427dc0
+$(DL_FILE)_MD5 = 435d27a73b25c936e0451cc4397ab986
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -54,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        $(PAK)
 
 ###############################################################################
@@ -80,49 +84,42 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch
 
-       mkdir -p -v $(DIR_APP)/build_libvirt && cd $(DIR_APP)/build_libvirt
-
-       cd $(DIR_APP)/build_libvirt && ../autogen.sh --no-git
-
-       cd $(DIR_APP)/build_libvirt && ../configure \
+       cd $(DIR_APP) && meson \
                --prefix=/usr \
                --localstatedir=/var \
                --sysconfdir=/etc \
-               --without-sasl \
-               --without-vbox \
-               --without-lxc \
-               --without-esx \
-               --without-vmware \
-               --without-openvz \
-               --without-firewalld \
-               --without-network \
-               --with-interface \
-               --with-virtualport \
-               --with-macvtap \
-               --without-wireshark-dissector \
-               --disable-nls \
-               --without-test-suite \
-               --without-dbus \
-               --with-qemu-user=nobody \
-               --with-qemu-group=kvm \
-               --with-storage-dir \
-               --with-storage-fs \
-               --with-storage-lvm \
-               --without-storage-iscsi \
-               --without-storage-scsi \
-               --without-storage-mpath \
-               --without-storage-disk \
-               --without-storage-rbd \
-               --without-storage-sheepdog \
-               --without-storage-gluster \
-               --without-storage-zfs
-
-       cd $(DIR_APP)/build_libvirt && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP)/build_libvirt && make install
+               -D docs=disabled \
+               -D sasl=disabled \
+               -D driver_vbox=disabled \
+               -D driver_lxc=disabled \
+               -D driver_esx=disabled \
+               -D driver_vmware=disabled \
+               -D driver_openvz=disabled \
+               -D firewalld=disabled \
+               -D driver_network=disabled \
+               -D driver_interface=enabled \
+               -D wireshark_dissector=disabled \
+               -D nls=disabled \
+               -D tests=disabled \
+               -D qemu_user=nobody \
+               -D qemu_group=kvm \
+               -D storage_dir=enabled \
+               -D storage_fs=enabled \
+               -D storage_lvm=enabled \
+               -D storage_iscsi=disabled \
+               -D storage_scsi=disabled \
+               -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/
+       cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && ninja -C builddir/ install
 
        #install initscripts
-       $(call INSTALL_INITSCRIPT,libvirtd)
-       $(call INSTALL_INITSCRIPT,virtlogd)
+       @$(call INSTALL_INITSCRIPTS,$(SERVICES))
        mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
 
        # Backup