From 358e3b825d1740fb6a9b2c3bfa509927d814d8b9 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 7 Apr 2017 17:48:40 +0200 Subject: [PATCH] fix packaging Makefile --- packaging/Makefile.inc | 2 +- packaging/rpm/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/Makefile.inc b/packaging/Makefile.inc index 96805d604..eb8b12685 100644 --- a/packaging/Makefile.inc +++ b/packaging/Makefile.inc @@ -1,6 +1,6 @@ TAROPTS = --exclude-ignore-recursive=.distignore --transform='s|^\.|villas-node-$(VERSION_NUM)|' --show-transformed-names -TAR_VILLAS = $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM)-1.$(GIT_BRANCH)_$(subst -,_,$(VARIANT)).$$(date +%Y%m%d)git$(GIT_REV).tar.gz +TAR_VILLAS = $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM)-1.$(GIT_BRANCH)_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV).tar.gz DEPLOY_HOST = root@villas.0l.de DEPLOY_PATH = /var/www/villas diff --git a/packaging/rpm/Makefile.inc b/packaging/rpm/Makefile.inc index de2894f55..5c244b395 100644 --- a/packaging/rpm/Makefile.inc +++ b/packaging/rpm/Makefile.inc @@ -26,7 +26,7 @@ rpm-libwebsockets: | $(RPMDIR)/RPMS $(BUILDDIR)/thirdparty/libwebsockets/ # We patch version number and release fields of the spec file based on the current Git commit $(SPEC_VILLAS): $(SRCDIR)/packaging/rpm/villas-node.spec | $$(dir $$@) sed -e "s/§VERSION§/$(VERSION_NUM)/g" \ - -e "s/§RELEASE§/1.$(GIT_BRANCH)_$(subst -,_,$(VARIANT)).$$(date +%Y%m%d)git$(GIT_REV)/g" < $^ > $@ + -e "s/§RELEASE§/1.$(GIT_BRANCH)_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV)/g" < $^ > $@ clean-rpm: rm -rf $(RPMDIR)