Fixes #16085: rudder-api-client packaging untar the sources two times

Normation · Oct 30, 2019 · ce1d496 · ce1d496
1 parent 39d5038
commit ce1d496
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/rudder-api-client/SOURCES/Makefile b/rudder-api-client/SOURCES/Makefile
@@ -31,7 +31,7 @@ endif
 # Pass an empty string to skip hash check
 GET=get() { $(_GET) "$$1.part" "$$2" && { openssl dgst -sha256 "$$1.part" | grep -q "$$3" || { echo "Wrong checksum, aborting"; exit 1; }; } && mv "$$1.part" "$$1"; }; get
 
-localdepends: ./rudder-sources
+localdepends: ./rudder-sources ./rudder-sources/rudder-api-client/build
 
 ./rudder-sources.tar.bz2:
 	$(GET) rudder-sources.tar.bz2 https://www.rudder-project.org/archives/rudder-sources-${RUDDER_VERSION_TO_PACKAGE}.tar.bz2 ""
@@ -40,6 +40,11 @@ localdepends: ./rudder-sources
 	tar -xjf rudder-sources.tar.bz2
 	mv rudder-sources-*/ rudder-sources/
 
+./rudder-sources/rudder-api-client/build:
+	cd rudder-sources/rudder-api-client && make install DESTDIR=build
+
+clean: localclean
+
 localclean:
 	rm -rf ./rudder-sources
 

diff --git a/rudder-api-client/debian/rules b/rudder-api-client/debian/rules
@@ -12,9 +12,6 @@ export DH_VERBOSE=1
 build:
 # Force python everywhere in 5.0
 	find . -type f | xargs sed -i '1,1s|#!/usr/bin/python3|#!/usr/bin/python|'
-	tar -xjf SOURCES/rudder-sources.tar.bz2
-	mkdir -p BUILD
-	mv rudder-sources-*/* BUILD/
 
 clean:
 	dh_testdir
@@ -40,6 +37,8 @@ binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
+	#
+	dh_install --sourcedir=$(CURDIR)/SOURCES/rudder-sources/rudder-api-client/ build/ /
 
 	dh_installman
 	dh_link