[Pkg-libvirt-maintainers] Bug#958087: Allow libvirt to build on non-linux architectures

[Laurent Bigonville]

Source: libvirt
Version: 6.0.0-5
Severity: important
Tags: patch

Hello,

Could you please disable polkit support on non-linux architectures and
make the BD against libglusterfs-dev architecture conditional?

polkit is no longer functionnal on these architecures since ConsoleKit
is gone and there is no existing logind implementation there. See: #927896

Kind regards,

Laurent Bigonville

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.5.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8), LANGUAGE=fr_BE:fr (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: SELinux: enabled - Mode: Permissive - Policy name: refpolicy
-------------- next part --------------
>From 4e6f9098c28e5f1be751568f35eef2ace549efdd Mon Sep 17 00:00:00 2001
From: Laurent Bigonville <bigon at debian.org>
Date: Sat, 18 Apr 2020 13:09:36 +0200
Subject: [PATCH 1/2] Disable polkit support on !linux, see: #927896

---
 debian/control | 6 +++---
 debian/rules   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 98ab4b34b..91c4d618b 100644
--- a/debian/control
+++ b/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],
@@ -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),
diff --git a/debian/rules b/debian/rules
index 4ac64fa58..44e40d782 100755
--- a/debian/rules
+++ b/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       \
-- 
2.26.1

-------------- next part --------------
>From 3ee1c87354eb6271b7fe53e2017caf7caa6d222d Mon Sep 17 00:00:00 2001
From: Laurent Bigonville <bigon at debian.org>
Date: Sat, 18 Apr 2020 13:22:53 +0200
Subject: [PATCH 2/2] Do not build-depends against libglusterfs-dev on
 non-linux architectures

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 91c4d618b..7a59b4e99 100644
--- a/debian/control
+++ b/debian/control
@@ -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,
-- 
2.26.1