Merge pull request #3138 from DanielG/fix-git-rev

Make GIT_REV logic work in release tarballs
This commit is contained in:
Miodrag Milanović 2022-05-25 11:33:11 +02:00 committed by GitHub
commit 904e2efe11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions

1
.gitattributes vendored
View File

@ -1 +1,2 @@
*.v linguist-language=Verilog
/.gitcommit export-subst

1
.gitcommit Normal file
View File

@ -0,0 +1 @@
$Format:%h$

View File

@ -130,7 +130,18 @@ LDLIBS += -lrt
endif
YOSYS_VER := 0.17+41
# Note: We arrange for .gitcommit to contain the (short) commit hash in
# tarballs generated with git-archive(1) using .gitattributes. The git repo
# will have this file in its unexpanded form tough, in which case we fall
# back to calling git directly.
TARBALL_GIT_REV := $(shell cat $(YOSYS_SRC)/.gitcommit)
ifeq ($(TARBALL_GIT_REV),$$Format:%h$$)
GIT_REV := $(shell git ls-remote $(YOSYS_SRC) HEAD -q | $(AWK) 'BEGIN {R = "UNKNOWN"}; ($$2 == "HEAD") {R = substr($$1, 1, 9); exit} END {print R}')
else
GIT_REV := $(TARBALL_GIT_REV)
endif
OBJS = kernel/version_$(GIT_REV).o
bumpversion: