[pve-devel] applied: [PATCH cluster] fix buildsys for new library packages

Thomas Lamprecht t.lamprecht at proxmox.com
Fri Nov 22 16:29:30 CET 2019


This was forgotten to add/update when the package was refactored ...

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6adbdb4..527edb5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,8 @@ PACKAGE=pve-cluster
 GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+LIBDEB  = libpve-cluster-perl_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+LIBDEB += libpve-cluster-api-perl_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 DBGDEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 
 PERL_APIVER := `perl -MConfig -e 'print $$Config{debian_abi}//$$Config{version};'`
@@ -16,11 +18,11 @@ cpgtest: cpgtest.c
 	gcc -Wall cpgtest.c $(shell pkg-config --cflags --libs libcpg libqb) -o cpgtest
 
 .PHONY: dinstall
-dinstall: ${DEB}
-	dpkg -i ${DEB} 
+dinstall: ${DEB} ${LIBDEB}
+	dpkg -i $^
 
 .PHONY: deb
-deb ${DBG_DEB}: ${DEB}
+deb ${DBG_DEB} ${LIBDEB}: ${DEB}
 ${DEB}:
 	rm -f *.deb
 	rm -rf build
@@ -32,8 +34,8 @@ ${DEB}:
 
 
 .PHONY: upload
-upload: ${DEB} ${DBG_DEB}
-	tar cf - ${DEB} ${DBGDEB}| ssh -X repoman at repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH}
+upload: ${DEB} ${DBG_DEB} ${LIBDEB}
+	tar cf - ${DEB} ${DBGDEB} ${LIBDEB}| ssh -X repoman at repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH}
 
 .PHONY: clean
 clean:
-- 
2.20.1





More information about the pve-devel mailing list