X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=8be47218ffab1a4f66eebeb4bd8a941562b91ad8;hb=baf4e3132dba97cab5a6cf3bf5aeb19d5aa0efd2;hp=7e0699c8a2875b83b8a73eb399ee5c90ba15fc88;hpb=84303d56d7fc49e82f1a76fede7424174a587541;p=pve-qemu.git

diff --git a/Makefile b/Makefile
index 7e0699c..8be4721 100644
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,60 @@
-# also update debian/changelog
-KVMVER=2.9.1
-KVMPKGREL=8
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
 
-KVMPACKAGE = pve-qemu-kvm
-KVMSRC = qemu
-BUILDSRC = $(KVMSRC).tmp
+PACKAGE = pve-qemu-kvm
 
 SRCDIR := qemu
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 
-ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION := $(shell git rev-parse HEAD)
 
-DEB = ${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
-DEB_DBG = ${KVMPACKAGE}-dbg_${KVMVER}-${KVMPKGREL}_${ARCH}.deb
+DEB = ${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DEB_DBG = ${PACKAGE}-dbg_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 DEBS = $(DEB) $(DEB_DBG)
 
-
 all: $(DEBS)
 
 .PHONY: submodule
 submodule:
-	test -f "${SRCDIR}/debian/changelog" || git submodule update --init
+	test -f "${SRCDIR}/configure" || git submodule update --init --recursive
+
+$(BUILDDIR): keycodemapdb | submodule
+	# check if qemu/ was used for a build
+	# if so, please run 'make distclean' in the submodule and try again
+	test ! -f $(SRCDIR)/build/config.status
+	rm -rf $(BUILDDIR)
+	cp -a $(SRCDIR) $(BUILDDIR)
+	cp -a debian $(BUILDDIR)/debian
+	rm -rf $(BUILDDIR)/ui/keycodemapdb
+	cp -a keycodemapdb $(BUILDDIR)/ui/
+	echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 
 .PHONY: deb kvm
 deb kvm: $(DEBS)
 $(DEB_DBG): $(DEB)
-$(DEB): | 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
-	# set package version
-	sed -i 's/^pkgversion="".*/pkgversion="${KVMPACKAGE}_${KVMVER}-${KVMPKGREL}"/' $(BUILDSRC)/configure
-	cd $(BUILDSRC); dpkg-buildpackage -b -rfakeroot -us -uc
-	lintian $(DEBS) || true
+$(DEB): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j
+	lintian $(DEBS)
+
+.PHONY: update
+update:
+	cd $(SRCDIR) && git submodule deinit ui/keycodemapdb || true
+	rm -rf $(SRCDIR)/ui/keycodemapdb
+	mkdir $(SRCDIR)/ui/keycodemapdb
+	cd $(SRCDIR) && git submodule update --init ui/keycodemapdb
+	rm -rf keycodemapdb
+	mkdir keycodemapdb
+	cp -R $(SRCDIR)/ui/keycodemapdb/* keycodemapdb/
+	git add keycodemapdb
 
 .PHONY: upload
 upload: $(DEBS)
-	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch
+	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist bullseye
 
-.PHONY: distclean
+.PHONY: distclean clean
 distclean: clean
-
-.PHONY: clean
 clean:
-	rm -rf $(BUILDSRC) $(KVMPACKAGE)_* $(DEBS) *.buildinfo
+	rm -rf $(BUILDDIR) $(PACKAGE)*.deb *.buildinfo *.changes
 
 .PHONY: dinstall
 dinstall: $(DEBS)