[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 2 commits: control: Drop Build-Depends on qemu-system-common

[Andrea Bolognani (@abologna)]

Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
6456ab69 by Andrea Bolognani at 2023-08-20T19:41:16+02:00
control: Drop Build-Depends on qemu-system-common

Up until recently, the qemu-{bridge,pr}-helper binaries included
in that package needed to be available at build time in order to
discover their non-standard location; as of libvirt 9.4.0,
however, that lookup is performed at runtime rather than build
time so we no longer need this Build-Depends.

- - - - -
cd2ed062 by Andrea Bolognani at 2023-08-20T19:41:19+02:00
rules: Introduce ARCHES_QEMU

The QEMU package only builds the system emulators on certain
architectures, with some being explicitly left out.

For those (currently alpha, hppa, ia64, m68k and sh4) it
doesn't make sense for us to try and build the QEMU driver,
as the system emulators are a requirement for it to be of
any use at all.

This should make libvirt buildable on those architectures,
or at the very least get us closer to that goal.

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -57,8 +57,7 @@ Build-Depends:
  po-debconf,
  python3-docutils,
  python3:native,
- qemu-system-common:native,
- qemu-utils,
+ qemu-utils [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  systemtap-sdt-dev [linux-any],
  xsltproc,
 Vcs-Git: https://salsa.debian.org/libvirt-team/libvirt.git
@@ -178,7 +177,7 @@ Description: Virtualization daemon
 
 Package: libvirt-daemon-driver-qemu
 Section: admin
-Architecture: linux-any
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
 Multi-Arch: no
 Depends:
  libvirt0 (= ${binary:Version}),


=====================================
debian/rules
=====================================
@@ -18,11 +18,17 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL
 
 ARCHES_CEPH = amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el riscv64 s390x
 ARCHES_GLUSTER = amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64
+ARCHES_QEMU = amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
 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
 ARCHES_VBOX = amd64 i386
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
+    ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_QEMU)))
+        WITH_QEMU             = -Ddriver_qemu=enabled
+    else
+        WITH_QEMU             = -Ddriver_qemu=disabled
+    endif
     ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_VBOX)))
         WITH_VBOX             = -Ddriver_vbox=enabled
     else
@@ -71,6 +77,7 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
         WITH_LOGIN_SHELL      = -Dlogin_shell=disabled
     endif
 else
+    WITH_QEMU                 = -Ddriver_qemu=disabled
     WITH_VBOX                 = -Ddriver_vbox=disabled
     WITH_LIBXL                = -Ddriver_libxl=disabled
     WITH_STORAGE_LVM          = -Dstorage_lvm=disabled
@@ -105,7 +112,7 @@ DEB_CONFIGURE_EXTRA_ARGS := \
     -Dinitconfdir=/etc/default \
     -Dpackager="$(DEB_VENDOR)" \
     -Dpackager_version="$(DEB_VERSION)" \
-    -Ddriver_qemu=enabled \
+    $(WITH_QEMU) \
     -Ddriver_libvirtd=enabled \
     -Ddriver_remote=enabled \
     -Dremote_default_mode=legacy \



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/26c4e495779fc9e7649956983818735bbc7300fd...cd2ed06217a165841f0210de6946c3278cff2b3b

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/26c4e495779fc9e7649956983818735bbc7300fd...cd2ed06217a165841f0210de6946c3278cff2b3b
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/20230820/2285b81f/attachment-0001.htm>