X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=blobdiff_plain;f=Makefile;h=b80cc898d8970fef9a087559d8a2b84612be66aa;hp=67b30dd0fdd23e511ebbea98b165069c3a0eabb5;hb=3996ca4c8336416d04edafe128042d9dd950a050;hpb=fd57461bbf76c083d8f069e9ece929becae75927

diff --git a/Makefile b/Makefile
index 67b30dd..b80cc89 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,42 @@
-RELEASE=4.2
+RELEASE=4.4
 
 # also update debian/changelog
-KVMVER=2.5
-KVMPKGREL=16
+KVMVER=2.7.1
+KVMPKGREL=500
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
 KVMSRC=${KVMDIR}-src.tar.gz
 
 ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+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 git://git.qemu-project.org/qemu.git -b stable-2.4 ${KVMDIR} 
-	git clone git://git.qemu-project.org/qemu.git ${KVMDIR}
-	# see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
-	cd ${KVMDIR}; git checkout v2.5.1.1; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
+	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v${KVMVER} ${KVMDIR}
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
-${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
@@ -38,15 +45,8 @@ ${DEBS} kvm: ${KVMSRC}
 	lintian ${DEBS} || true
 
 .PHONY: upload
-upload: ${DEBS} ${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
-	rm -rf /pve/${RELEASE}/extra/${KVMPACKAGE}-dbg_*.deb
-	cp ${DEBS} /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