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

Tue Aug 6 09:35:37 CEST 2019

On PVE 6.0-2 with GlusterFS repository set up installing the patched 
pve-qemu-kvm and then glusterfs-common gives conflicts:

root at pve:~# apt update && apt list --upgradeable && dpkg -i 
./pve-qemu-kvm_4.0.0-4_amd64.deb && apt update && apt install 
glusterfs-common
Hit:1 http://ftp.at.debian.org/debian buster InRelease
Hit:2 http://ftp.at.debian.org/debian buster-updates InRelease 

Hit:3 http://security.debian.org buster/updates InRelease 

Hit:4 http://download.proxmox.com/debian/pve buster InRelease 

Hit:5 
https://download.gluster.org/pub/gluster/glusterfs/6/LATEST/Debian/buster/amd64/apt 
buster InRelease
Reading package lists... Done
Building dependency tree
Reading state information... Done
2 packages can be upgraded. Run 'apt list --upgradable' to see them.
Listing... Done
glusterfs-client/unknown 6.4-1 amd64 [upgradable from: 5.5-3]
glusterfs-common/unknown 6.4-1 amd64 [upgradable from: 5.5-3]
(Reading database ... 49759 files and directories currently installed.)
Preparing to unpack .../pve-qemu-kvm_4.0.0-4_amd64.deb ...
Unpacking pve-qemu-kvm (4.0.0-4) over (4.0.0-3) ...
Setting up pve-qemu-kvm (4.0.0-4) ...
Processing triggers for mime-support (3.62) ...
Processing triggers for man-db (2.8.5-2) ...
Hit:1 http://ftp.at.debian.org/debian buster InRelease
Hit:2 http://ftp.at.debian.org/debian buster-updates InRelease 

Hit:3 http://security.debian.org buster/updates InRelease 

Hit:4 http://download.proxmox.com/debian/pve buster InRelease 

Hit:5 
https://download.gluster.org/pub/gluster/glusterfs/6/LATEST/Debian/buster/amd64/apt 
buster InRelease
Reading package lists... Done
Building dependency tree
Reading state information... Done
2 packages can be upgraded. Run 'apt list --upgradable' to see them.
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following packages will be REMOVED:
   libgfapi0 libgfchangelog0 libgfdb0 libgfrpc0 libgfxdr0 
libglusterfs-dev libglusterfs0
   proxmox-ve pve-manager pve-qemu-kvm qemu-server spiceterm
The following packages will be upgraded:
   glusterfs-common
1 upgraded, 0 newly installed, 12 to remove and 1 not upgraded.
Need to get 5,849 kB of archives.
After this operation, 73.5 MB disk space will be freed.
Do you want to continue? [Y/n] n
Abort.

root at pve:~# dpkg-deb -I ./pve-qemu-kvm_4.0.0-4_amd64.deb
  new Debian package, version 2.0.
  size 11682476 bytes: control archive=4688 bytes.
       38 bytes,     2 lines      conffiles
     1455 bytes,    15 lines      control
     9828 bytes,   141 lines      md5sums
  Package: pve-qemu-kvm
  Version: 4.0.0-4
  Architecture: amd64
  Maintainer: Proxmox Support Team <support at proxmox.com>
  Installed-Size: 46062
  Depends: ceph-common (>= 0.48), iproute2, libaio1 (>= 0.3.93), 
libglusterfs0 | glusterfs-common, libiscsi7 (>= 1.18.0), libjemalloc2 
(>= 5.0.0), libjpeg62-turbo (>= 1.3.1), libsdl1.2debian, 
libspice-server1 (>= 0.14.0~), libusb-1.0-0 (>= 2:1.0.22), 
libusbredirparser1 (>= 0.6-2), libuuid1 (>= 2.16), numactl, python, 
libacl1 (>= 2.2.23), libasound2 (>= 1.0.16), libc6 (>= 2.28), libcap2 
(>= 1:2.10), libcurl3-gnutls (>= 7.16.3), libgcc1 (>= 1:4.7), libgfapi0, 
libgfrpc0, libgfxdr0, libglib2.0-0 (>= 2.57.2), libgnutls30 (>= 3.6.6), 
libncursesw6 (>= 6), libnettle6, libnuma1 (>= 2.0.11), libpixman-1-0 (>= 
0.30.0), libpng16-16 (>= 1.6.2-1), librados2, librbd1, libsasl2-2 (>= 
2.1.27+dfsg), libseccomp2 (>= 2.1.0), libstdc++6 (>= 4.6), libtinfo6 (>= 
6), zlib1g (>= 1:1.2.0)
  Conflicts: kvm, pve-kvm, pve-qemu-kvm-2.6.18, qemu, qemu-kvm, 
qemu-system-arm, qemu-system-common, qemu-system-x86, qemu-utils
  Replaces: pve-kvm, pve-qemu-kvm-2.6.18, qemu-system-arm, 
qemu-system-x86, qemu-utils
  Provides: qemu-system-arm, qemu-system-x86, qemu-utils
  Section: admin
  Priority: optional
  Description: Full virtualization on x86 hardware
   Using KVM, one can run multiple virtual PCs, each running unmodified 
Linux or
   Windows images. Each virtual machine has private virtualized hardware: a
   network card, disk, graphics adapter, etc.

On 8/5/19 2:35 PM, Fabian Grünbichler wrote:
> 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
> 