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

[Wolfgang Bumiller]

applied

On Tue, Aug 06, 2019 at 11:13:47AM +0200, Fabian Grünbichler wrote:
> build-depend on Buster's re-introduced libglusterfs-dev, and depend on
> either libglusterfs0 / libgfFOO (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:
>     unfortunately, this still requires a pretty explicit re-installation of
>     glusterfs-common and glusterfs-client in order to upgrade to the upstream
>     repos, but at least it is possible now..
>     
>     changes:
>     
>     v2->v3:
>     
>     - add more libraries
>     
>     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 | 10 ++++++++--
>  debian/rules   |  4 +++-
>  2 files changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/debian/control b/debian/control
> index 188f8af..2609f1c 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,15 @@ Standards-Version: 3.7.2
>  Package: pve-qemu-kvm
>  Architecture: any
>  Depends: ceph-common (>= 0.48),
> -         glusterfs-common (>= 3.5.2-1),
>           iproute2,
>           libaio1,
> +         libgfapi0 | glusterfs-common (>= 5.6),
> +         libgfchangelog0 | glusterfs-common (>= 5.6),
> +         libgfdb0 | glusterfs-common (>= 5.6),
> +         libgfrpc0 | glusterfs-common (>= 5.6),
> +         libgfxdr0 | glusterfs-common (>= 5.6),
> +         libglusterfs-dev | glusterfs-common (>= 5.6),
> +         libglusterfs0 | glusterfs-common (>= 5.6),
>           libiscsi4 (>= 1.12.0) | libiscsi7,
>           libjemalloc2,
>           libjpeg62-turbo,
> diff --git a/debian/rules b/debian/rules
> index 4f6987e..8f428c7 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 and lots of libgfFOO, upstream has the libs in glusterfs-common
> +	# pass -x to dpkg-shlibdeps and specify dependencies in d/control instead
> +	dh_shlibdeps -- -xlibglusterfs0 -xlibgfxdr0 -xlibgfrpc0 -xlibgfdb0 -xlibgfchangelog0 -xlibgfapi0
>  	dh_gencontrol
>  	dh_md5sums
>  	dh_builddeb
> -- 
> 2.20.1