diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2021-12-30 18:45:15 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2022-05-25 11:20:09 +0200 |
| commit | 222e7a2da345f01980d9261c40c5d50eced4f9ab (patch) | |
| tree | fd5c7802d19695997fd40f05ff534c053ac1937e | |
| parent | cffec1f95f0ac4bad1deb24bf7f921bd93145a16 (diff) | |
| download | yosys-222e7a2da345f01980d9261c40c5d50eced4f9ab.tar.gz yosys-222e7a2da345f01980d9261c40c5d50eced4f9ab.tar.bz2 yosys-222e7a2da345f01980d9261c40c5d50eced4f9ab.zip | |
Make GIT_REV logic work in release tarballs
Currently GIT_REV doesn't get set properly when building a release
tarball. To fix this we arrange for .gitcommit to contain the (short)
commit hash in tarballs generated with git-archive(1) using export-subst in
gitattributes. This way the correct commit hash is (reproducibly) included
in the release tarballs while not burdening the maintainers with updating
it in the git repo.
Please note this even works on Github and similar forges as they use
git-archive for generating tarballs so this works out quite nicely.
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .gitcommit | 1 | ||||
| -rw-r--r-- | Makefile | 11 |
3 files changed, 13 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index f85ae06c9..5e568606e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.v linguist-language=Verilog +/.gitcommit export-subst diff --git a/.gitcommit b/.gitcommit new file mode 100644 index 000000000..46b7856fb --- /dev/null +++ b/.gitcommit @@ -0,0 +1 @@ +$Format:%h$ @@ -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: |