[Cryptech-Commits] [releng/alpha] branch fmc_clk updated: Fix generated Debian package names ("_" is illegal).

git at cryptech.is git at cryptech.is
Sun Jul 15 01:52:09 UTC 2018

This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch fmc_clk
in repository releng/alpha.

The following commit(s) were added to refs/heads/fmc_clk by this push:
     new 693e194  Fix generated Debian package names ("_" is illegal).
693e194 is described below

commit 693e194e9c5439248fb7f63c8d4bb7dd94655c24
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Sat Jul 14 21:49:32 2018 -0400

    Fix generated Debian package names ("_" is illegal).
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ccc61fd..3666b5f 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ GIT_BRANCHES	 := $(filter-out HEAD,$(sort $(notdir $(shell git for-each-ref --fo
 # other package names (constructed on other branches) with which this
 # one conflicts.
-PACKAGE_BRANCH	  = ${PACKAGE_BASE_NAME}$(and $(filter-out master,$(1)),-$(1))
+PACKAGE_BRANCH	  = ${PACKAGE_BASE_NAME}$(and $(filter-out master,$(1)),-$(subst _,-,$(1)))
 PACKAGE_CONFLICT := $(foreach I,$(filter-out ${GIT_BRANCH},${GIT_BRANCHES}),$(call PACKAGE_BRANCH,${I}))

To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the Commits mailing list