buildsys: use full DEB_VERSION and correct DEB_HOST_ARCH

and drop git and srcdir variable

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index b904fe7fbfdcac6ff52829673dd6c2e5eb202fe6..3b26f8d93c3091dd8083a65480399613abda1cc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,8 @@ XTERMJSTGZ=xterm-$(XTERMJSVER).tgz
 FITADDONVER=0.5.0
 FITADDONTGZ=xterm-addon-fit-$(FITADDONVER).tgz
 
-SRCDIR=src
-GITVERSION:=$(shell git rev-parse HEAD)
-
-DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
-DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
+DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
 DSC=rust-$(CRATENAME)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 ifeq ($(BUILD_MODE), release)
@@ -50,7 +47,8 @@ build:
        rm build/Cargo.lock
        find build/debian -name "*.hint" -delete
        cp build/debian/control debian/control
-       echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout $(GITVERSION)" > build/debian/SOURCE
+       echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout $$(git rev-parse HEAD)" \
+           > $@.tmp/debian/SOURCE
 
 .PHONY: deb
 deb: $(DEB)
@@ -73,8 +71,8 @@ download:
        wget https://registry.npmjs.org/xterm-addon-fit/-/$(FITADDONTGZ) -O $(FITADDONTGZ).tmp
        mv $(XTERMJSTGZ).tmp $(XTERMJSTGZ)
        mv $(FITADDONTGZ).tmp $(FITADDONTGZ)
-       tar -C $(SRCDIR)/www -xf $(XTERMJSTGZ) package/lib package/css --strip-components=2 $(X_EXCLUSIONS)
-       tar -C $(SRCDIR)/www -xf $(FITADDONTGZ) package/lib --strip-components=2 $(X_EXCLUSIONS)
+       tar -C src/www -xf $(XTERMJSTGZ) package/lib package/css --strip-components=2 $(X_EXCLUSIONS)
+       tar -C src/www -xf $(FITADDONTGZ) package/lib --strip-components=2 $(X_EXCLUSIONS)
        rm $(XTERMJSTGZ) $(FITADDONTGZ)
 
 .PHONY: upload

diff --git a/debian/rules b/debian/rules
index 2b62edd5bedd70cb0c26ce50ff321b4c139d6a35..02d4e95a2421217af1a242b948205a3f59033d6a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/rustc/architecture.mk
+
 %:
        dh $@ --buildsystem cargo
 
 override_dh_auto_build:
        dh_auto_build
-       sed -e 's/@VERSION@/${VERSION}/' src/www/index.html.tpl.in > src/www/index.html.tpl
-       sed -e 's/@VERSION@/${VERSION}/' src/www/index.html.hbs.in > src/www/index.html.hbs
+       sed -e 's/@VERSION@/$(DEB_VERSION)/' src/www/index.html.tpl.in > src/www/index.html.tpl
+       sed -e 's/@VERSION@/$(DEB_VERSION)/' src/www/index.html.hbs.in > src/www/index.html.hbs
        rm src/www/index.html.tpl.in src/www/index.html.hbs.in