[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/experimental] 5 commits: rules: Enable ZFS support correctly
Guido Günther
gitlab at salsa.debian.org
Wed Aug 19 08:35:08 BST 2020
Guido Günther pushed to branch debian/experimental at Libvirt Packaging Team / libvirt
Commits:
cb9de24b by Andrea Bolognani at 2020-08-19T07:05:56+00:00
rules: Enable ZFS support correctly
Starting with
commit 3ce2f8690933b72f65c42ebaa2ccbe8821e1eecd
Author: Guido Günther <agx at sigxcpu.org>
Date: Sun Aug 14 15:28:28 2016 +0200
Support zfs on Linux too
ZFS support is supposed to be enabled both for Linux and for
non-Linux, which makes it unnecessary to use the WITH_STORAGE_ZFS
variable.
Moreover, while
commit ee7cd36509d10535628ca402990675644578671b
Author: Guido Günther <agx at sigxcpu.org>
Date: Tue Aug 9 06:58:44 2016 +0200
Enable zfs pool support
Closes: #827245
was intended to initially enable ZFS support on non-Linux only,
in fact the logic that was introduced with that commit was along
the lines of
if linux:
zfs = False
else:
if linux:
zfs = True
which means that ZFS only ended up being enabled on non-Linux
because the newly-introduced Build-Depends on zfsutils triggered
libvirt's feature autodetection logic.
Gbp-Dch: Ignore
- - - - -
6193c399 by Andrea Bolognani at 2020-08-19T07:05:57+00:00
rules: Enable sanlock support correctly
When sanlock support was introduced with
commit e4714b7d895a154ccc74a471d65b120122e35c49
Author: Guido Günther <agx at sigxcpu.org>
Date: Fri Jun 8 16:13:24 2012 +0200
Add sanlock support
the non-Linux branch was not filled in, and the contents of the
WITH_SANLOCK variable were never passed to configure, which means
that sanlock support only ended up being enabled on Linux because
the newly-introduced Build-Depends on libsanlock-dev triggered
libvirt's feature autodetection logic.
Gbp-Dch: Ignore
- - - - -
6cbe83eb by Andrea Bolognani at 2020-08-19T07:05:57+00:00
rules: Enable OpenVZ support correctly
When OpenVZ was made Linux-only with
commit 17570fc900f26deaf45c2072dd81c5f0d3fb727b
Author: Guido Günther <agx at sigxcpu.org>
Date: Sat Jun 11 12:31:45 2011 +0200
Enable OpenVZ on Linux only
the non-Linux branch was not updated accordingly.
Gbp-Dch: Ignore
- - - - -
84a04e69 by Andrea Bolognani at 2020-08-19T07:05:58+00:00
rules: Enable GlusterFS support correctly
When GlusterFS support was enabled with
commit f0d27edfb47bd8338b55e47f5d3f35021c6e877d
Author: Guido Günther <agx at sigxcpu.org>
Date: Fri Sep 8 11:37:33 2017 +0200
Enable Gluster support
only the Linux branch was modified accordingly.
Gbp-Dch: Ignore
- - - - -
d0d54bdb by Andrea Bolognani at 2020-08-19T07:05:59+00:00
rules: Don't use --with-systemd-daemon
The option was introduced in
commit 448ab8c5ba51ebe91d8c5062ef4027b1c7de7045
Author: Guido Günther <agx at sigxcpu.org>
Date: Fri Mar 7 10:54:46 2014 +0100
Build-depend on libsystemd-daemon-dev on linux
but it was never passed to configure: if one tries that today,
the result is
configure: WARNING: unrecognized options: --with-systemd-daemon
The libsystemd-daemon dependency itself no longer exists, having
been replaced with a libsystemd dependency in 5409dc10c9e7 and
ultimately being abandoned in favor of libdbus in 903cbca07140.
Gbp-Dch: Ignore
- - - - -
1 changed file:
- debian/rules
Changes:
=====================================
debian/rules
=====================================
@@ -31,7 +31,6 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
WITH_STORAGE_ISCSI = --with-storage-iscsi
WITH_STORAGE_DISK = --with-storage-disk
WITH_STORAGE_RBD = --with-storage-rbd
- WITH_STORAGE_ZFS = --with-storage-zfs
WITH_STORAGE_GLUSTER = --with-storage-gluster
WITH_UDEV = --with-udev
WITH_CAPNG = --with-capng
@@ -42,7 +41,6 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
WITH_POLKIT = --with-polkit
WITH_SANLOCK = --with-sanlock
WITH_INIT_SCRIPT = --with-init-script=systemd
- WITH_SYSTEMD = --with-systemd-daemon
WITH_FIREWALLD = --with-firewalld
WITH_ATTR = --with-attr
WITH_AUDIT = --with-audit
@@ -57,23 +55,22 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
WITH_LXC = --with-lxc
endif
else
- ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
- WITH_STORAGE_ZFS = --with-storage-zfs
- endif
WITH_STORAGE_LVM = --without-storage-lvm
WITH_STORAGE_ISCSI = --without-storage-iscsi
WITH_STORAGE_DISK = --without-storage-disk
WITH_STORAGE_RBD = --without-storage-rbd
+ WITH_STORAGE_GLUSTER = --without-storage-gluster
WITH_UDEV = --without-udev
WITH_CAPNG = --without-capng
WITH_MACVTAP = --without-macvtap
WITH_NETWORK = --without-network
+ WITH_OPENVZ = --without-openvz
WITH_LXC = --without-lxc
WITH_NUMA = --without-numactl --without-numad
WITH_NETCF = --without-netcf
WITH_INIT_SCRIPT = --with-init-script=none
WITH_POLKIT = --without-polkit
- WITH_SYSTEMD = --without-systemd-daemon
+ WITH_SANLOCK = --without-sanlock
WITH_FIREWALLD = --without-firewalld
WITH_ATTR = --without-attr
WITH_AUDIT = --without-audit
@@ -101,6 +98,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
--with-yajl \
--with-ssh2 \
$(WITH_POLKIT) \
+ $(WITH_SANLOCK) \
$(WITH_UDEV) \
--with-storage-fs \
--with-storage-dir \
@@ -110,7 +108,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
--without-storage-sheepdog \
$(WITH_STORAGE_RBD) \
$(WITH_STORAGE_GLUSTER) \
- $(WITH_STORAGE_ZFS) \
+ --with-storage-zfs \
$(WITH_INIT_SCRIPT) \
$(WITH_NUMA) \
$(WITH_SELINUX) \
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/7beca8e1bce61c6821fabd445c68fd298073ad18...d0d54bdb7dac62edef6b858deb48e0e7136a202c
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/7beca8e1bce61c6821fabd445c68fd298073ad18...d0d54bdb7dac62edef6b858deb48e0e7136a202c
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/20200819/e90356b9/attachment-0001.html>
More information about the Pkg-libvirt-commits
mailing list