[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 12 commits: changelog: Create entry for 6.9.0-2
Andrea Bolognani
gitlab at salsa.debian.org
Mon Nov 16 09:49:29 GMT 2020
Andrea Bolognani pushed to branch debian/master at Libvirt Packaging Team / libvirt
Commits:
aa0bf8ac by Andrea Bolognani at 2020-11-15T15:46:52+01:00
changelog: Create entry for 6.9.0-2
Gbp-Dch: Ignore
- - - - -
aa957cc9 by Andrea Bolognani at 2020-11-15T15:46:52+01:00
control: Add explicit section for all packages
Gbp-Dch: Ignore
- - - - -
3673eb83 by Andrea Bolognani at 2020-11-15T15:46:52+01:00
rules: Tweak whitespace
Make room for longer WITH_ variables. No functional changes.
Gbp-Dch: Ignore
- - - - -
597182e1 by Andrea Bolognani at 2020-11-15T15:46:52+01:00
rules: Introduce ARCHES_* variables
Some features (namely the lxc, xen and vbox drivers) can only be
enabled on a subset of all possible Linux architectures, and this
fact is reflected both when installing build dependencies and when
choosing which arguments to pass to Meson.
Using explicit architecture lists makes it easier to make sure
they're always up to date and to quickly verify that the data is
consistent between debian/rules and debian/control.
This is similar in spirit to upstream commit
https://gitlab.com/libvirt/libvirt/-/commit/974dc0a4c678af8ccb9224abecc834bb593e81fa
Gbp-Dch: Ignore
- - - - -
4e533099 by Andrea Bolognani at 2020-11-15T15:46:52+01:00
rules: Enable/disable virt-login-shell explicitly
Gbp-Dch: Ignore
- - - - -
d6726ab2 by Andrea Bolognani at 2020-11-15T15:46:52+01:00
libvirt-daemon: Expand wildcards
We will soon need to be more deliberate in how we deal with these
files. Listing all the files explicitly instead of using wildcards
would be a good idea regardless, because it ensures that upstream
changes don't go unnoticed.
Gbp-Dch: Ignore
- - - - -
7ad0fe3b by Andrea Bolognani at 2020-11-15T15:46:52+01:00
libvirt-daemon-driver-storage-iscsi-direct: New binary package
This storage driver has existed in libvirt since forever, but
we've never enabled it in Debian until now.
- - - - -
aadb56a3 by Andrea Bolognani at 2020-11-15T15:48:26+01:00
libvirt-login-shell: New binary package
The virt-login-shell tool is not as commonly used as virsh and
virt-admin, plus it only works locally and has a hard dependency
on the lxc driver, so it makes more sense for it to be in its own
separate binary package.
- - - - -
807a8de4 by Andrea Bolognani at 2020-11-15T16:13:16+01:00
libvirt-clients: Move out virt-qemu-run
This tool requires the qemu driver to be available locally in
order to work, so it belongs in the libvirt-daemon-driver-qemu
package.
People who only had libvirt-clients installed before upgrading
would not have been able to use it successfully, and for those
who had a setup where virt-qemu-run worked things will be
shuffled around smoothly during upgrade, so there's no need to
make a big deal about this change.
- - - - -
3af477fc by Andrea Bolognani at 2020-11-15T16:13:26+01:00
libvirt-daemon: Move out libvirt_lxc
This is a helper used by the lxc driver, and as such it belongs
with it rather than with the daemon itself.
The transition will be completely transparent to anyone with a
working lxc driver installation, so no need to make a fuss about
it.
- - - - -
03f8bbbd by Andrea Bolognani at 2020-11-15T16:13:29+01:00
libvirt-daemon: Move out sanlock-related files
The libvirt_sanlock_helper and virt-sanlock-cleanup utilities
are for exclusive use of the sanlock driver, and as such they
belong with it rather than with the daemon itself.
The transition will be completely transparent to anyone with a
working sanlock installation, so no need to make a fuss about
it.
- - - - -
b94f6498 by Andrea Bolognani at 2020-11-15T16:13:32+01:00
libvirt-daemon: Move out bash-completion support
The completion scripts are for clients such as virsh and
virt-admin, not the daemon, and so they belong in the
libvirt-clients binary package.
- - - - -
14 changed files:
- debian/changelog
- debian/control
- + debian/libvirt-clients.NEWS
- debian/libvirt-clients.install
- + debian/libvirt-clients.maintscript
- debian/libvirt-daemon-driver-lxc.install
- debian/libvirt-daemon-driver-qemu.install
- + debian/libvirt-daemon-driver-storage-iscsi-direct.docs
- + debian/libvirt-daemon-driver-storage-iscsi-direct.install
- debian/libvirt-daemon.install
- + debian/libvirt-login-shell.docs
- + debian/libvirt-login-shell.install
- debian/libvirt-sanlock.install
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+libvirt (6.9.0-2) experimental; urgency=medium
+
+ * Team upload
+
+ -- Andrea Bolognani <eof at kiyuko.org> Sat, 14 Nov 2020 22:30:41 +0100
+
libvirt (6.9.0-1) unstable; urgency=medium
* Team upload
=====================================
debian/control
=====================================
@@ -23,6 +23,7 @@ Build-Depends:
libgcrypt20-dev,
libglusterfs-dev [linux-any],
libgnutls28-dev,
+ libiscsi-dev [linux-any],
libnetcf-dev (>= 1:0.2.3-3~) [linux-any],
libnl-3-dev [linux-any],
libnl-route-3-dev [linux-any],
@@ -41,7 +42,7 @@ Build-Depends:
libudev-dev [linux-any],
libwireshark-dev (>= 1.11.3),
libwiretap-dev,
- libxen-dev (>= 4.3) [i386 amd64 armhf arm64],
+ libxen-dev (>= 4.3) [amd64 arm64 armhf i386],
libxml2-dev (>= 2.9.2+really2.9.1+dfsg1-0.2),
libxml2-utils,
libyajl-dev,
@@ -82,6 +83,12 @@ Depends:
${shlibs:Depends},
Suggests:
libvirt-daemon,
+Breaks:
+ libvirt-daemon (<< 6.9.0-2~),
+ libvirt-daemon-driver-qemu (<< 6.9.0-2~),
+ libvirt-login-shell (<< 6.9.0-2~),
+Replaces:
+ libvirt-daemon (<< 6.9.0-2~),
Description: Programs for the libvirt library
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -90,6 +97,27 @@ Description: Programs for the libvirt library
.
This package contains the libvirt shell virsh and other client binaries.
+Package: libvirt-login-shell
+Section: admin
+Architecture: alpha amd64 arm64 armel armhf hppa i386 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
+Depends:
+ libvirt-daemon-driver-lxc,
+ libvirt0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks:
+ libvirt-clients (<< 6.9.0-2~),
+Replaces:
+ libvirt-clients (<< 6.9.0-2~),
+Description: Isolate user sessions using LXC containers
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This package contains the virt-login-shell tool, which can be set as a user's
+ login shell to isolate their sessions using LXC containers.
+
Package: libvirt-daemon
Section: admin
Architecture: any
@@ -107,6 +135,7 @@ Recommends:
qemu-kvm | qemu (>= 0.9.1),
Suggests:
libvirt-daemon-driver-storage-gluster,
+ libvirt-daemon-driver-storage-iscsi-direct,
libvirt-daemon-driver-storage-rbd,
libvirt-daemon-driver-storage-zfs,
libvirt-daemon-system,
@@ -115,6 +144,10 @@ Enhances:
qemu,
qemu-kvm,
xen,
+Breaks:
+ libvirt-clients (<< 6.9.0-2~),
+ libvirt-daemon-driver-lxc (<< 6.9.0-2~),
+ libvirt-sanlock (<< 6.9.0-2~),
Description: Virtualization daemon
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -131,8 +164,10 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Breaks:
+ libvirt-clients (<< 6.9.0-2~),
libvirt-daemon (<< 6.0.0-1~),
Replaces:
+ libvirt-clients (<< 6.9.0-2~),
libvirt-daemon (<< 6.0.0-1~),
Description: Virtualization daemon QEMU connection driver
Libvirt is a C toolkit to interact with the virtualization capabilities
@@ -144,15 +179,15 @@ Description: Virtualization daemon QEMU connection driver
Package: libvirt-daemon-driver-lxc
Section: admin
-Architecture: linux-any
+Architecture: alpha amd64 arm64 armel armhf hppa i386 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
Depends:
libvirt-daemon (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
Breaks:
- libvirt-daemon (<< 6.0.0-1~),
+ libvirt-daemon (<< 6.9.0-2~),
Replaces:
- libvirt-daemon (<< 6.0.0-1~),
+ libvirt-daemon (<< 6.9.0-2~),
Description: Virtualization daemon LXC connection driver
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -218,6 +253,22 @@ Description: Virtualization daemon glusterfs storage driver
.
This package contains the libvirtd storage driver for GlusterFS.
+Package: libvirt-daemon-driver-storage-iscsi-direct
+Section: admin
+Architecture: linux-any
+Depends:
+ libvirt-daemon (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Virtualization daemon iSCSI (libiscsi) storage driver
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This package contains a libvirtd storage driver for iSCSI volumes implemented
+ using libiscsi.
+
Package: libvirt-daemon-driver-storage-rbd
Section: admin
Architecture: linux-any
@@ -399,12 +450,17 @@ Description: development files for the libvirt library
needed for developing the applications with libvirt.
Package: libvirt-sanlock
+Section: admin
Architecture: linux-any
Depends:
augeas-tools,
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
+Breaks:
+ libvirt-daemon (<< 6.9.0-2~),
+Replaces:
+ libvirt-daemon (<< 6.9.0-2~),
Description: Sanlock plugin for virtlockd
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -414,6 +470,7 @@ Description: Sanlock plugin for virtlockd
This package contains the sanlock plugin for libvirt's locking daemon.
Package: libnss-libvirt
+Section: admin
Architecture: linux-any
Multi-Arch: same
Pre-Depends:
@@ -433,6 +490,7 @@ Description: nss plugins providing IP address resolution for virtual machines
names while the 'libvirt' plugin looks at the guest's hostname.
Package: libvirt-wireshark
+Section: admin
Architecture: any
Depends:
${misc:Depends},
=====================================
debian/libvirt-clients.NEWS
=====================================
@@ -0,0 +1,7 @@
+libvirt (6.9.0-2) experimental; urgency=medium
+
+ The virt-login-shell tool has been moved from the libvirt-clients
+ package to the new libvirt-login-shell package: this change makes
+ it possible to uninstall this seldomly-used tool if desired.
+
+ -- Andrea Bolognani <eof at kiyuko.org> Sun, 15 Nov 2020 03:45:44 +0100
=====================================
debian/libvirt-clients.install
=====================================
@@ -3,17 +3,15 @@ etc/libvirt/libvirt.conf
usr/bin/virsh
usr/bin/virt-admin
usr/bin/virt-host-validate
-usr/bin/virt-login-shell
usr/bin/virt-pki-validate
-usr/bin/virt-qemu-run
usr/bin/virt-xml-validate
-usr/lib/libvirt/virt-login-shell-helper
+usr/share/bash-completion/completions/virsh
+usr/share/bash-completion/completions/virt-admin
+usr/share/bash-completion/completions/vsh
usr/share/man/man1/virsh.1
usr/share/man/man1/virt-admin.1
usr/share/man/man1/virt-host-validate.1
-usr/share/man/man1/virt-login-shell.1
usr/share/man/man1/virt-pki-validate.1
-usr/share/man/man1/virt-qemu-run.1
usr/share/man/man1/virt-xml-validate.1
usr/share/man/man7/virkeycode-*.7
usr/share/man/man7/virkeyname-*.7
=====================================
debian/libvirt-clients.maintscript
=====================================
@@ -0,0 +1,2 @@
+# Moved to libvirt-login-shell
+rm_conffile /etc/libvirt/libvirt-login-shell.conf 6.9.0-2~ libvirt-clients
=====================================
debian/libvirt-daemon-driver-lxc.install
=====================================
@@ -1,3 +1,4 @@
usr/lib/*/libvirt/connection-driver/libvirt_driver_lxc.so
+usr/lib/libvirt/libvirt_lxc
usr/share/augeas/lenses/libvirtd_lxc.aug
usr/share/augeas/lenses/tests/test_libvirtd_lxc.aug
=====================================
debian/libvirt-daemon-driver-qemu.install
=====================================
@@ -1,3 +1,5 @@
+usr/bin/virt-qemu-run
usr/lib/*/libvirt/connection-driver/libvirt_driver_qemu.so
usr/share/augeas/lenses/libvirtd_qemu.aug
usr/share/augeas/lenses/tests/test_libvirtd_qemu.aug
+usr/share/man/man1/virt-qemu-run.1
=====================================
debian/libvirt-daemon-driver-storage-iscsi-direct.docs
=====================================
@@ -0,0 +1 @@
+usr/share/doc/libvirt/NEWS
=====================================
debian/libvirt-daemon-driver-storage-iscsi-direct.install
=====================================
@@ -0,0 +1 @@
+usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so
=====================================
debian/libvirt-daemon.install
=====================================
@@ -14,9 +14,10 @@ usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_mpath.so
usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_scsi.so
usr/lib/*/libvirt/storage-file/libvirt_storage_file_fs.so
usr/lib/libvirt/libvirt-guests.sh
-usr/lib/libvirt/libvirt_*
+usr/lib/libvirt/libvirt_iohelper
+usr/lib/libvirt/libvirt_leaseshelper
+usr/lib/libvirt/libvirt_parthelper
usr/sbin/libvirtd
-usr/sbin/virt-sanlock-cleanup
usr/sbin/virtlockd
usr/sbin/virtlogd
usr/share/augeas/lenses/libvirt_lockd.aug
@@ -29,5 +30,6 @@ usr/share/augeas/lenses/tests/test_virtlockd.aug
usr/share/augeas/lenses/tests/test_virtlogd.aug
usr/share/augeas/lenses/virtlockd.aug
usr/share/augeas/lenses/virtlogd.aug
-usr/share/bash-completion/*
-usr/share/man/man8/*
+usr/share/man/man8/libvirtd.8
+usr/share/man/man8/virtlockd.8
+usr/share/man/man8/virtlogd.8
=====================================
debian/libvirt-login-shell.docs
=====================================
@@ -0,0 +1 @@
+usr/share/doc/libvirt/NEWS
=====================================
debian/libvirt-login-shell.install
=====================================
@@ -0,0 +1,4 @@
+etc/libvirt/virt-login-shell.conf
+usr/bin/virt-login-shell
+usr/lib/libvirt/virt-login-shell-helper
+usr/share/man/man1/virt-login-shell.1
=====================================
debian/libvirt-sanlock.install
=====================================
@@ -1 +1,4 @@
usr/lib/*/libvirt/lock-driver/sanlock.so
+usr/lib/libvirt/libvirt_sanlock_helper
+usr/sbin/virt-sanlock-cleanup
+usr/share/man/man8/virt-sanlock-cleanup.8
=====================================
debian/rules
=====================================
@@ -15,71 +15,79 @@ DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+ARCHES_LXC = alpha amd64 arm64 armel armhf hppa i386 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
+ARCHES_XEN = amd64 arm64 armhf i386
+ARCHES_VBOX = amd64 i386
+
ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
- ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
- WITH_VBOX = -Ddriver_vbox=enabled
+ ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_VBOX)))
+ WITH_VBOX = -Ddriver_vbox=enabled
else
- WITH_VBOX = -Ddriver_vbox=disabled
+ WITH_VBOX = -Ddriver_vbox=disabled
endif
- ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 armhf arm64))
- WITH_LIBXL = -Ddriver_libxl=enabled
- XEN_ENABLED = 1
+ ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_XEN)))
+ WITH_LIBXL = -Ddriver_libxl=enabled
else
- WITH_LIBXL = -Ddriver_libxl=disabled
+ WITH_LIBXL = -Ddriver_libxl=disabled
endif
- WITH_STORAGE_LVM = -Dstorage_lvm=enabled
- WITH_STORAGE_ISCSI = -Dstorage_iscsi=enabled
- WITH_STORAGE_DISK = -Dstorage_disk=enabled
- WITH_STORAGE_RBD = -Dstorage_rbd=enabled
- WITH_STORAGE_GLUSTER = -Dstorage_gluster=enabled
- WITH_UDEV = -Dudev=enabled
- WITH_CAPNG = -Dcapng=enabled
- WITH_LIBNL = -Dlibnl=enabled
- WITH_NETWORK = -Ddriver_network=enabled
- WITH_OPENVZ = -Ddriver_openvz=enabled
- WITH_NETCF = -Dnetcf=enabled
- WITH_POLKIT = -Dpolkit=enabled
- WITH_SANLOCK = -Dsanlock=enabled
- WITH_INIT_SCRIPT = -Dinit_script=systemd
- WITH_FIREWALLD = -Dfirewalld=enabled
- WITH_ATTR = -Dattr=enabled
- WITH_AUDIT = -Daudit=enabled
- WITH_SELINUX = -Dselinux=enabled -Dsecdriver_selinux=enabled -Dselinux_mount=/sys/fs/selinux
- WITH_APPARMOR = -Dapparmor=enabled -Dsecdriver_apparmor=enabled -Dapparmor_profiles=true
- WITH_NSS_PLUGIN = -Dnss=enabled
- WITH_DTRACE = -Ddtrace=enabled
- WITH_NUMA = -Dnumactl=enabled -Dnumad=enabled
- ifneq (,$(findstring $(DEB_HOST_ARCH), ia64))
- WITH_LXC = -Ddriver_lxc=disabled
+ WITH_STORAGE_LVM = -Dstorage_lvm=enabled
+ WITH_STORAGE_ISCSI = -Dstorage_iscsi=enabled
+ WITH_STORAGE_ISCSI_DIRECT = -Dstorage_iscsi_direct=enabled
+ WITH_STORAGE_DISK = -Dstorage_disk=enabled
+ WITH_STORAGE_RBD = -Dstorage_rbd=enabled
+ WITH_STORAGE_GLUSTER = -Dstorage_gluster=enabled
+ WITH_UDEV = -Dudev=enabled
+ WITH_CAPNG = -Dcapng=enabled
+ WITH_LIBNL = -Dlibnl=enabled
+ WITH_NETWORK = -Ddriver_network=enabled
+ WITH_OPENVZ = -Ddriver_openvz=enabled
+ WITH_NETCF = -Dnetcf=enabled
+ WITH_POLKIT = -Dpolkit=enabled
+ WITH_SANLOCK = -Dsanlock=enabled
+ WITH_INIT_SCRIPT = -Dinit_script=systemd
+ WITH_FIREWALLD = -Dfirewalld=enabled
+ WITH_ATTR = -Dattr=enabled
+ WITH_AUDIT = -Daudit=enabled
+ WITH_SELINUX = -Dselinux=enabled -Dsecdriver_selinux=enabled -Dselinux_mount=/sys/fs/selinux
+ WITH_APPARMOR = -Dapparmor=enabled -Dsecdriver_apparmor=enabled -Dapparmor_profiles=true
+ WITH_NSS_PLUGIN = -Dnss=enabled
+ WITH_DTRACE = -Ddtrace=enabled
+ WITH_NUMA = -Dnumactl=enabled -Dnumad=enabled
+ ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_LXC)))
+ WITH_LXC = -Ddriver_lxc=enabled
+ WITH_LOGIN_SHELL = -Dlogin_shell=enabled
else
- WITH_LXC = -Ddriver_lxc=enabled
+ WITH_LXC = -Ddriver_lxc=disabled
+ WITH_LOGIN_SHELL = -Dlogin_shell=disabled
endif
else
- WITH_VBOX = -Ddriver_vbox=disabled
- WITH_LIBXL = -Ddriver_libxl=disabled
- WITH_STORAGE_LVM = -Dstorage_lvm=disabled
- WITH_STORAGE_ISCSI = -Dstorage_iscsi=disabled
- WITH_STORAGE_DISK = -Dstorage_disk=disabled
- WITH_STORAGE_RBD = -Dstorage_rbd=disabled
- WITH_STORAGE_GLUSTER = -Dstorage_gluster=disabled
- WITH_UDEV = -Dudev=disabled
- WITH_CAPNG = -Dcapng=disabled
- WITH_LIBNL = -Dlibnl=disabled
- WITH_NETWORK = -Ddriver_network=disabled
- WITH_OPENVZ = -Ddriver_openvz=disabled
- WITH_NETCF = -Dnetcf=disabled
- WITH_POLKIT = -Dpolkit=disabled
- WITH_SANLOCK = -Dsanlock=disabled
- WITH_INIT_SCRIPT = -Dinit_script=none
- WITH_FIREWALLD = -Dfirewalld=disabled
- WITH_ATTR = -Dattr=disabled
- WITH_AUDIT = -Daudit=disabled
- WITH_SELINUX = -Dselinux=disabled -Dsecdriver_selinux=disabled -Dselinux_mount=
- WITH_APPARMOR = -Dapparmor=disabled -Dsecdriver_apparmor=disabled -Dapparmor_profiles=false
- WITH_NSS_PLUGIN = -Dnss=disabled
- WITH_DTRACE = -Ddtrace=disabled
- WITH_NUMA = -Dnumactl=disabled -Dnumad=disabled
- WITH_LXC = -Ddriver_lxc=disabled
+ WITH_VBOX = -Ddriver_vbox=disabled
+ WITH_LIBXL = -Ddriver_libxl=disabled
+ WITH_STORAGE_LVM = -Dstorage_lvm=disabled
+ WITH_STORAGE_ISCSI = -Dstorage_iscsi=disabled
+ WITH_STORAGE_ISCSI_DIRECT = -Dstorage_iscsi_direct=disabled
+ WITH_STORAGE_DISK = -Dstorage_disk=disabled
+ WITH_STORAGE_RBD = -Dstorage_rbd=disabled
+ WITH_STORAGE_GLUSTER = -Dstorage_gluster=disabled
+ WITH_UDEV = -Dudev=disabled
+ WITH_CAPNG = -Dcapng=disabled
+ WITH_LIBNL = -Dlibnl=disabled
+ WITH_NETWORK = -Ddriver_network=disabled
+ WITH_OPENVZ = -Ddriver_openvz=disabled
+ WITH_NETCF = -Dnetcf=disabled
+ WITH_POLKIT = -Dpolkit=disabled
+ WITH_SANLOCK = -Dsanlock=disabled
+ WITH_INIT_SCRIPT = -Dinit_script=none
+ WITH_FIREWALLD = -Dfirewalld=disabled
+ WITH_ATTR = -Dattr=disabled
+ WITH_AUDIT = -Daudit=disabled
+ WITH_SELINUX = -Dselinux=disabled -Dsecdriver_selinux=disabled -Dselinux_mount=
+ WITH_APPARMOR = -Dapparmor=disabled -Dsecdriver_apparmor=disabled -Dapparmor_profiles=false
+ WITH_NSS_PLUGIN = -Dnss=disabled
+ WITH_DTRACE = -Ddtrace=disabled
+ WITH_NUMA = -Dnumactl=disabled -Dnumad=disabled
+ WITH_LXC = -Ddriver_lxc=disabled
+ WITH_LOGIN_SHELL = -Dlogin_shell=disabled
endif
DEB_CONFIGURE_EXTRA_ARGS := \
@@ -104,6 +112,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
-Dstorage_dir=enabled \
$(WITH_STORAGE_LVM) \
$(WITH_STORAGE_ISCSI) \
+ $(WITH_STORAGE_ISCSI_DIRECT) \
$(WITH_STORAGE_DISK) \
-Dstorage_sheepdog=disabled \
$(WITH_STORAGE_RBD) \
@@ -121,6 +130,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
$(WITH_LIBXL) \
$(WITH_VBOX) \
$(WITH_LXC) \
+ $(WITH_LOGIN_SHELL) \
$(WITH_DTRACE) \
$(WITH_AUDIT) \
$(WITH_FIREWALLD) \
@@ -232,12 +242,11 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
dh_install -p libvirt-daemon-system etc/libvirt/qemu-sanlock.conf
dh_install -p libvirt-daemon-system etc/libvirt/qemu/networks/
dh_install -p libvirt-daemon-system etc/libvirt/nwfilter/
- dh_install -p libvirt-clients etc/libvirt/virt-login-shell.conf
dh_install -p libnss-libvirt \
usr/lib/$(DEB_HOST_MULTIARCH)/libnss_libvirt*.so.2 \
lib/$(DEB_HOST_MULTIARCH)/
endif
-ifeq ($(XEN_ENABLED), 1)
+ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_XEN)))
dh_install -p libvirt-daemon-system etc/libvirt/libxl.conf
dh_install -p libvirt-daemon-system etc/libvirt/libxl-lockd.conf
dh_install -p libvirt-daemon-system etc/libvirt/libxl-sanlock.conf
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/b1f7cfa6a723b849ca2bacab01eafb45c40229b2...b94f649805df41639df75643fb0fba9e156275ad
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/b1f7cfa6a723b849ca2bacab01eafb45c40229b2...b94f649805df41639df75643fb0fba9e156275ad
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20201116/faa0b5e9/attachment-0001.html>
More information about the Pkg-libvirt-commits
mailing list