[pve-devel] [PATCH v2 qemu] fix #2269: build: adapt to glusterfs changes

Fabian Grünbichler f.gruenbichler at proxmox.com
Mon Aug 5 14:35:55 CEST 2019


build-depend on Buster's re-introduced libglusterfs-dev, and depend on
either libglusterfs0 (Debian repos) or glusterfs-common (upstream
community repos), until the latter gets fixed upstream.

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
Notes:
    v1->v2:
    
    - fix typo
    - drop existing explicit glusterfs-common dependency
    
    this removes the following packages from the transitive set of build-dependencies:
    
    - attr (libattr-dev should cover this)
    - e2fsprogs (essential anyway)
    - libext2fs2 (transitively essential anyway)
    - libpython3.7
    - libss2 (transitively essential anyway)
    - liburcu6
    - psmisc
    - python3-jwt
    - python3-prettytable
    
    since they were pulled in by glusterfs-common. this should be okay, but a
    second pair of eyes would be appreciated.

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

diff --git a/debian/control b/debian/control
index 188f8af..021a3be 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Maintainer: Proxmox Support Team <support at proxmox.com>
 Build-Depends: autotools-dev,
                check,
                debhelper (>= 9),
-               glusterfs-common (>= 3.5.2-1),
                libacl1-dev,
                libaio-dev,
                libcap-dev,
                libcurl4-gnutls-dev,
                libfdt-dev,
+               libglusterfs-dev (>= 5.2-2),
                libgnutls28-dev,
                libiscsi-dev (>= 1.12.0),
                libjemalloc-dev,
@@ -36,9 +36,9 @@ Standards-Version: 3.7.2
 Package: pve-qemu-kvm
 Architecture: any
 Depends: ceph-common (>= 0.48),
-         glusterfs-common (>= 3.5.2-1),
          iproute2,
          libaio1,
+         libglusterfs0 | glusterfs-common,
          libiscsi4 (>= 1.12.0) | libiscsi7,
          libjemalloc2,
          libjpeg62-turbo,
diff --git a/debian/rules b/debian/rules
index 4f6987e..9340c62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,7 +159,9 @@ binary-arch: build install
 #	dh_perl
 #	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
+	# Debian >= Buster has libglusterfs0, upstream has the lib in glusterfs-common
+	# pass -x to dpkg-shlibdeps and specify dependencies in d/control instead
+	dh_shlibdeps -- -xlibglusterfs0
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-- 
2.20.1




More information about the pve-devel mailing list