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

diff --git a/Makefile b/Makefile
index 95718c0..7af638a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,35 @@
-RELEASE=4.4
-
 # also update debian/changelog
-KVMVER=2.7.1
-KVMPKGREL=1
+KVMVER=2.9.0
+KVMTAG=$(KVMVER)-rc2
+KVMPKGREL=1~rc2
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
 KVMSRC=${KVMDIR}-src.tar.gz
 
-ARCH=amd64
+ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 GITVERSION:=$(shell git rev-parse master)
 
-DEBS=							\
-${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb	\
-${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEB=${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEB_DBG=${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEBS=$(DEB) $(DEB_DBG)
 
 
-all: ${DEBS}
+all: $(DEBS)
 
 .PHONY: download
 download:
-	@echo "---                                                  ---"
-	@echo "--- TODO when updating to a new release:             ---"
-	@echo "--- Check if efi-roms-1182.tar.xz is still required. ---"
-	@echo "---                                                  ---"
-	@false
 	rm -rf ${KVMDIR} ${KVMSRC}
-	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v${KVMVER} ${KVMDIR}
+	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}
 
-.PHONY: deb
-deb ${DEBS} kvm: ${KVMSRC}
+.PHONY: deb kvm
+deb kvm: $(DEBS)
+$(DEB_DBG): $(DEB)
+$(DEB): $(KVMSRC)
 	rm -f *.deb
 	rm -rf ${KVMDIR}
 	tar xf ${KVMSRC} 
-	tar -C ${KVMDIR} -xJf efi-roms-1182.tar.xz
 	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
@@ -43,8 +38,8 @@ deb ${DEBS} kvm: ${KVMSRC}
 	lintian ${DEBS} || true
 
 .PHONY: upload
-upload: ${DEBS} ${KVMDIR}-src.tar.gz
-	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
+upload: ${DEBS}
+	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch
 
 .PHONY: distclean
 distclean: clean
@@ -52,7 +47,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ ${KVMDIR} ${KVMPACKAGE}_* ${DEBS}
+	rm -rf *.changes *.buildinfo ${KVMDIR} ${KVMPACKAGE}_* ${DEBS}
 
 .PHONY: dinstall
 dinstall: ${DEBS}