X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=b8eaef7f9335aacc3463e9ab3c6934d3963186c8;hb=64be2e75572dfb92b5fddf5768f41e39df43baee;hp=911f98006f0ec55b64fa68d5b8f5c0f44bd9ec05;hpb=6c7dbd74a9f76ca6054f89c2852dc3cd8569613e;p=pve-qemu.git

diff --git a/Makefile b/Makefile
index 911f980..b8eaef7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # also update debian/changelog
-KVMVER=2.9.0
-KVMPKGREL=5
+KVMVER=3.0.1
+KVMPKGREL=2
 
 KVMPACKAGE = pve-qemu-kvm
 KVMSRC = qemu
@@ -9,7 +9,7 @@ BUILDSRC = $(KVMSRC).tmp
 SRCDIR := qemu
 
 ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION := $(shell git rev-parse master)
+GITVERSION := $(shell git rev-parse HEAD)
 
 DEB = ${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
 DEB_DBG = ${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
@@ -25,18 +25,31 @@ submodule:
 .PHONY: deb kvm
 deb kvm: $(DEBS)
 $(DEB_DBG): $(DEB)
-$(DEB): | submodule
+$(DEB): keycodemapdb | submodule
 	rm -f *.deb
 	rm -rf $(BUILDSRC)
 	mkdir $(BUILDSRC)
 	cp -a $(KVMSRC)/* $(BUILDSRC)/
 	cp -a debian $(BUILDSRC)/debian
-	echo "git clone git://git.proxmox.com/git/pve-qemu-kvm.git\\ngit checkout $(GITVERSION)" > $(BUILDSRC)/debian/SOURCE
+	rm -rf $(BUILDSRC)/ui/keycodemapdb
+	cp -a keycodemapdb $(BUILDSRC)/ui/
+	echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $(BUILDSRC)/debian/SOURCE
 	# set package version
 	sed -i 's/^pkgversion="".*/pkgversion="${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}"/' $(BUILDSRC)/configure
-	cd $(BUILDSRC); dpkg-buildpackage -b -rfakeroot -us -uc
+	cd $(BUILDSRC); dpkg-buildpackage -b -rfakeroot -us -uc -j
 	lintian $(DEBS) || true
 
+.PHONY: update
+update:
+	cd $(KVMSRC) && git submodule deinit ui/keycodemapdb || true
+	rm -rf $(KVMSRC)/ui/keycodemapdb
+	mkdir $(KVMSRC)/ui/keycodemapdb
+	cd $(KVMSRC) && git submodule update --init ui/keycodemapdb
+	rm -rf keycodemapdb
+	mkdir keycodemapdb
+	cp -R $(KVMSRC)/ui/keycodemapdb/* keycodemapdb/
+	git add keycodemapdb
+
 .PHONY: upload
 upload: $(DEBS)
 	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch