X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=d993730341e18246f6213e43d336aeecb922c000;hb=89a514bde5698a3e5294eb260d4cf11977929ea1;hp=0c3b59ba8ebef143435e19104fa5482d5bf795d0;hpb=8e31246e5d95c3cf5977d8f7f0355d369bf11424;p=pve-qemu-kvm.git

diff --git a/Makefile b/Makefile
index 0c3b59b..d993730 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
-RELEASE=4.0
+RELEASE=4.2
 
 # also update debian/changelog
-KVMVER=2.4
-KVMPKGREL=14
+KVMVER=2.7.0
+KVMPKGREL=8
 
 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	\
@@ -20,15 +20,21 @@ 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} 
-	cd ${KVMDIR}; git checkout v2.4.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
+deb ${DEBS} kvm: ${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,14 +44,7 @@ ${DEBS} kvm: ${KVMSRC}
 
 .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
+	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
 
 .PHONY: distclean
 distclean: clean