qemu-img : add -n option to dd to skip destination image create

[pve-qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 3c0bb4c02a603dd1e89b288b47e2f674fa2f7ec9..998c31eb1363cfdb817d4c305f406a2703fd6dc4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # also update debian/changelog
-KVMVER=2.9.0
-KVMPKGREL=1~rc2+5
+KVMVER=2.11.1
+KVMPKGREL=3
 
 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
        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