From 8f29e3d495f345a2771769dea2339652a60ce7ad Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 6 Jul 2017 23:21:23 +0200 Subject: [PATCH] allow dashes in branch names for building RPM packages --- 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 cdfe79856..468ffae0f 100644 --- a/packaging/Makefile.inc +++ b/packaging/Makefile.inc @@ -22,7 +22,7 @@ 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)).$(shell date +%Y%m%d)git$(GIT_REV).tar.gz +TAR_VILLAS = $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM)-1.$(subst -,_,$(GIT_BRANCH))_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV).tar.gz DEPLOY_USER ?= acs DEPLOY_HOST ?= villas.fein-aachen.org diff --git a/packaging/rpm/Makefile.inc b/packaging/rpm/Makefile.inc index e9fb10b4f..a4c987485 100644 --- a/packaging/rpm/Makefile.inc +++ b/packaging/rpm/Makefile.inc @@ -56,7 +56,7 @@ rpm-libwebsockets: | $(RPMDIR)/RPMS/x86_64/ $(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)).$(shell date +%Y%m%d)git$(GIT_REV)/g" < $^ > $@ + -e "s/§RELEASE§/1.$(subst -,_,$(GIT_BRANCH))_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV)/g" < $^ > $@ sign-rpm: rpmsign $(RPMDIR)/RPMS/*/.rpm