X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=blobdiff_plain;f=Makefile;h=7af638af5d53bbb4baf32dbed2fe5132f2de0a11;hp=def35b9e833d1b534c919d5dec9f8a9ec2c8e28e;hb=e9ee6d7c11d1bf8b90db8e8a13ef4feb35b72336;hpb=00b676aee83552caf283eb5f96bbeef2b63fbf3f

diff --git a/Makefile b/Makefile
index def35b9..7af638a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,45 @@
-RELEASE=3.4
-
 # also update debian/changelog
-KVMVER=2.2
-KVMPKGREL=7
+KVMVER=2.9.0
+KVMTAG=$(KVMVER)-rc2
+KVMPKGREL=1~rc2
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
 KVMSRC=${KVMDIR}-src.tar.gz
 
-ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+GITVERSION:=$(shell git rev-parse master)
+
+DEB=${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEB_DBG=${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEBS=$(DEB) $(DEB_DBG)
 
-KVM_DEB=${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
 
-all: ${KVM_DEB} ${KVMSRC}
+all: $(DEBS)
 
 .PHONY: download
 download:
 	rm -rf ${KVMDIR} ${KVMSRC}
-	#git clone git://git.qemu-project.org/qemu.git -b stable-2.1 ${KVMDIR} 
-	git clone git://git.qemu-project.org/qemu.git ${KVMDIR} 
-	cd ${KVMDIR}; git checkout v2.2.0
+	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v${KVMTAG} ${KVMDIR}
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${KVM_DEB} kvm: ${KVMSRC}
+.PHONY: deb kvm
+deb kvm: $(DEBS)
+$(DEB_DBG): $(DEB)
+$(DEB): $(KVMSRC)
+	rm -f *.deb
 	rm -rf ${KVMDIR}
 	tar xf ${KVMSRC} 
 	cp -a debian ${KVMDIR}/debian
 	echo "git clone git://git.proxmox.com/git/pve-qemu-kvm.git\\ngit checkout ${GITVERSION}" > ${KVMDIR}/debian/SOURCE
+	# set package version
+	sed -i 's/^pkgversion="".*/pkgversion="${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}"/' ${KVMDIR}/configure
 	cd ${KVMDIR}; dpkg-buildpackage -b -rfakeroot -us -uc
-	lintian ${KVM_DEB} || true
+	lintian ${DEBS} || true
 
 .PHONY: upload
-upload: ${KVM_DEB} ${KVMDIR}-src.tar.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -rf /pve/${RELEASE}/extra/Packages*
-	rm -rf /pve/${RELEASE}/extra/${KVMPACKAGE}_*.deb
-	cp ${KVM_DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+upload: ${DEBS}
+	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: distclean
 distclean: clean
@@ -47,8 +47,8 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ ${KVMDIR} ${KVMPACKAGE}_*
+	rm -rf *.changes *.buildinfo ${KVMDIR} ${KVMPACKAGE}_* ${DEBS}
 
 .PHONY: dinstall
-dinstall: ${KVM_DEB}
-	dpkg -i ${KVM_DEB}
+dinstall: ${DEBS}
+	dpkg -i ${DEBS}