[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 3 commits: rules: avoid $(findstring) for architecture filtering

[Andrea Bolognani (@abologna)]

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


Commits:
7785a451 by Pino Toscano at 2023-04-10T13:31:38+02:00
rules: avoid $(findstring) for architecture filtering

$(findstring) will look for matches anywhere in the string,
even within words: this means that it may match unwanted
architectures, e.g. the old architecture "mips" would match
in a list of architectures containing "mipsel".

To avoid this problem, use $(filter) which looks for entire
words in the search text.

A couple of occurrences (the "linux" cases) are switched
directly to string comparison, as it is more logic for them.

Gbp-Dch: Ignore

- - - - -
351123e3 by Pino Toscano at 2023-04-10T13:32:22+02:00
Limit architectures with RBD support

Ceph is not available on all the Linux architectures, but
only on some of them. Since it's an optional storage driver,
simply built it only where possible.

Gbp-Dch: Short

- - - - -
689bbe6f by Pino Toscano at 2023-04-10T13:32:24+02:00
control: switch libc6-dev B-D to libc-dev

libc has SONAME 6 on most of the architectures, but not on
all of them. Hence, switch to the SONAME-unversioned
libc-dev (which is provided by any libcN-dev), so it works
automatically no matter the glibc SONAME.

Gbp-Dch: Ignore

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
  libattr1-dev [linux-any],
  libaudit-dev [linux-any],
  libblkid-dev,
- libc6-dev (>= 2.31-14~),
+ libc-dev (>= 2.31-14~),
  libcap-ng-dev [linux-any],
  libcurl4-gnutls-dev,
  libdevmapper-dev [linux-any],
@@ -32,8 +32,8 @@ Build-Depends:
  libparted-dev,
  libpcap0.8-dev,
  libpciaccess-dev,
- librados-dev [linux-any],
- librbd-dev [linux-any],
+ librados-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el riscv64 s390x],
+ librbd-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el riscv64 s390x],
  libreadline-dev,
  libsanlock-dev [linux-any],
  libsasl2-dev,
@@ -291,7 +291,7 @@ Description: Virtualization daemon iSCSI (libiscsi) storage driver
 
 Package: libvirt-daemon-driver-storage-rbd
 Section: admin
-Architecture: linux-any
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el riscv64 s390x
 Multi-Arch: no
 Depends:
  libvirt-daemon (= ${binary:Version}),


=====================================
debian/rules
=====================================
@@ -12,17 +12,18 @@ DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
+ARCHES_CEPH = amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64el riscv64 s390x
 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
 
-ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
-    ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_VBOX)))
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+    ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_VBOX)))
         WITH_VBOX             = -Ddriver_vbox=enabled
     else
         WITH_VBOX             = -Ddriver_vbox=disabled
     endif
-    ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_XEN)))
+    ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_XEN)))
         WITH_LIBXL            = -Ddriver_libxl=enabled
     else
         WITH_LIBXL            = -Ddriver_libxl=disabled
@@ -31,7 +32,11 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
     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
+    ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_CEPH)))
+        WITH_STORAGE_RBD      = -Dstorage_rbd=enabled
+    else
+        WITH_STORAGE_RBD      = -Dstorage_rbd=disabled
+    endif
     WITH_STORAGE_GLUSTER      = -Dstorage_gluster=enabled
     WITH_UDEV                 = -Dudev=enabled
     WITH_CAPNG                = -Dcapng=enabled
@@ -247,7 +252,7 @@ execute_after_dh_auto_install:
 	   $(DEB_DESTDIR)/usr/share/libvirt/
 
 execute_after_dh_install:
-ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
+ifeq ($(DEB_HOST_ARCH_OS), linux)
 	# Linux supports more nice things:
 	set -e; for f in $(SRV_MONOLITHIC); do \
 	    dh_install -p libvirt-daemon-system \
@@ -280,7 +285,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 	               lib/$(DEB_HOST_MULTIARCH)/; \
 	done
 endif
-ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_XEN)))
+ifneq (,$(filter $(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/23c7d715c2c82adf64fe12ccc2a22e53a2cca4d5...689bbe6f74714fc55d7e1ae351bfa2125c85da0d

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/23c7d715c2c82adf64fe12ccc2a22e53a2cca4d5...689bbe6f74714fc55d7e1ae351bfa2125c85da0d
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/20230411/0a4d35b4/attachment-0001.htm>