X-Git-Url: https://git.proxmox.com/?p=pve-sheepdog.git;a=blobdiff_plain;f=Makefile;h=8a809f33bbd560cf32efa9c2060ff4b00f793dcc;hp=ffeacc13e2894ffb9164ab4553537114e6839cce;hb=HEAD;hpb=d216b6b7fb185738ac5d39d5262da5573cfcf5d2

diff --git a/Makefile b/Makefile
index ffeacc1..8a809f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-RELEASE=3.0
-
 PACKAGE=pve-sheepdog
 PKGREL=1
-SDVER=0.6.0
+SDVER=1.0.2
+
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB=${PACKAGE}_${SDVER}-${PKGREL}_amd64.deb
+DEB=${PACKAGE}_${SDVER}-${PKGREL}_${ARCH}.deb
 
 SDDIR=sheepdog-${SDVER}
 SDSRC=${SDDIR}.tar.gz
@@ -14,29 +15,22 @@ all: ${DEB}
 ${DEB} deb: ${SDSRC}
 	rm -rf ${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
 	cd ${SDDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
 	lintian -X copyright-file ${DEB}
 
 .PHONY: download
 ${SDSRC} download:
 	rm -rf ${SDDIR} sheepdog.git
-	git clone git://github.com/collie/sheepdog.git sheepdog.git
-	cd sheepdog.git; git checkout -b local v${SDVER}
-	rsync -a --exclude .git --exclude .gitignore sheepdog.git/ ${SDDIR} 
-	tar czf ${SDSRC}.tmp  ${SDDIR}
-	rm -rf ${SDDIR}
+	git clone git://github.com/sheepdog/sheepdog.git -b v1.0.2_rc0 sheepdog.git
+	cd sheepdog.git; git archive --format=tar.gz -o ../${SDSRC}.tmp v1.0 --prefix=${SDDIR}/
 	mv ${SDSRC}.tmp ${SDSRC}
 
 .PHONY: upload
 upload: ${DEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/pve-sheepdog*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch
 
 clean:
 distclean: clean
@@ -44,7 +38,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ debian/*~ *.deb *.changes *.dsc ${SDDIR} ${SDSRC}.tmp
+	rm -rf *~ debian/*~ *.deb *.changes *.buildinfo *.dsc ${SDDIR} ${SDSRC}.tmp
 
 .PHONY: dinstall
 dinstall: ${DEB}