[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/sid] 2 commits: Disable polkit support on !linux, see: #927896

[Guido Günther]

Guido Günther pushed to branch debian/sid at Libvirt Packaging Team / libvirt


Commits:
4e6f9098 by Laurent Bigonville at 2020-04-18T13:09:36+02:00
Disable polkit support on !linux, see: #927896

- - - - -
3ee1c873 by Laurent Bigonville at 2020-04-18T13:22:53+02:00
Do not build-depends against libglusterfs-dev on non-linux architectures

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -24,9 +24,9 @@ Build-Depends:
  libudev-dev [linux-any],
  libpciaccess-dev,
  kmod [linux-any],
- policykit-1 (>= 0.105-4~),
+ policykit-1 (>= 0.105-4~) [linux-any],
  libcurl4-gnutls-dev,
- libpolkit-gobject-1-dev,
+ libpolkit-gobject-1-dev [linux-any],
  libcap-ng-dev [linux-any],
  libnl-3-dev [linux-any],
  libnl-route-3-dev [linux-any],
@@ -52,7 +52,7 @@ Build-Depends:
  librbd-dev [linux-any],
  librados-dev [linux-any],
 # for --with-storage-gluster
- libglusterfs-dev,
+ libglusterfs-dev [linux-any],
 # for --with-wireshark-dissector
  libwireshark-dev (>= 1.11.3),
  libwiretap-dev,
@@ -257,7 +257,7 @@ Depends:
  libvirt-daemon-system-systemd | libvirt-daemon-system-sysv,
  iptables (>= 1.8.1-1) [linux-any] | firewalld,
  logrotate,
- policykit-1,
+ policykit-1 [linux-any],
 Recommends:
  dmidecode,
  dnsmasq-base (>= 2.46-1),


=====================================
debian/rules
=====================================
@@ -36,6 +36,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_NETWORK        = --with-network
   WITH_OPENVZ         = --with-openvz
   WITH_NETCF          = --with-netcf
+  WITH_POLKIT         = --with-polkit
   WITH_SANLOCK        = --with-sanlock
   WITH_INIT_SCRIPT    =	--with-init-script=systemd
   WITH_SYSTEMD        = --with-systemd-daemon
@@ -75,6 +76,7 @@ else
   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_FIREWALLD      = --without-firewalld
   WITH_AUDIT          = --without-audit
@@ -101,7 +103,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	--with-sasl              \
 	--with-yajl              \
 	--with-ssh2		 \
-	--with-polkit		 \
+	$(WITH_POLKIT)		 \
 	$(WITH_UDEV)		 \
 	--with-storage-fs        \
 	--with-storage-dir       \



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/d04fa4860c010dfd10a34988bd997252c164c5cd...3ee1c87354eb6271b7fe53e2017caf7caa6d222d

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/d04fa4860c010dfd10a34988bd997252c164c5cd...3ee1c87354eb6271b7fe53e2017caf7caa6d222d
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/20200423/0989e553/attachment-0001.html>