[pve-devel] [PATCH 4/4] Use git archive instead of rsync to build tarball.

Wolfgang Link w.link at proxmox.com
Tue Jul 5 10:47:38 CEST 2016


---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 39baf35..57a8e9d 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,8 @@ all: ${DEB}
 
 ${DEB} deb: ${SDSRC}
 	rm -rf ${SDDIR}
-	tar xf ${SDSRC}
+	mkdir ${SDDIR}
+	cd ${SDDIR}; tar xf ../${SDSRC}
 	mv ${SDDIR}/debian ${SDDIR}/debian.org
 	cp -av debian ${SDDIR}/debian
 	echo "git clone git://git.proxmox.com/git/pve-sheepdog.git\\ngit checkout ${GITVERSION}" > ${SDDIR}/debian/SOURCE
@@ -30,9 +31,7 @@ ${SDSRC} download:
 	cd sheepdog.git; git checkout -b revert v1.0
 	# we like to have the dog binary in sbin and not in bin
 	cd sheepdog.git; git revert 18335ece8876f7ef0b745c37de555646314c1943 --no-edit
-	rsync -a --exclude .git --exclude .gitignore sheepdog.git/ ${SDDIR}
-	tar czf ${SDSRC}.tmp  ${SDDIR}
-	rm -rf ${SDDIR}
+	cd sheepdog.git; git archive --format=tar.gz -o ../${SDSRC}.tmp revert
 	mv ${SDSRC}.tmp ${SDSRC}
 
 .PHONY: upload
-- 
2.1.4





More information about the pve-devel mailing list