fix #2269: build: adapt to glusterfs changes
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@proxmox.com>
This commit is contained in:
		
							parent
							
								
									937226f202
								
							
						
					
					
						commit
						f3c1e32615
					
				
							
								
								
									
										10
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							| @ -5,12 +5,12 @@ Maintainer: Proxmox Support Team <support@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, | ||||
|  | ||||
							
								
								
									
										4
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @ -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 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Fabian Grünbichler
						Fabian Grünbichler