riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4487 from YosysHQ/emil/abc-reproducible-git-hash 

Reproducible git hash
This commit is contained in:
Emil J 2024-07-18 11:54:07 +02:00 committed by GitHub
parent 49f547782c 0cd55e1d7c
commit 1d7a47bb6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitcommit
View File

@ -1 +1 @@
$Format:%h$ $Format:%H$

6
Makefile
View File

@ -155,7 +155,7 @@ YOSYS_VER := 0.43+11
# will have this file in its unexpanded form tough, in which case we fall # will have this file in its unexpanded form tough, in which case we fall
# back to calling git directly. # back to calling git directly.
TARBALL_GIT_REV := $(shell cat $(YOSYS_SRC)/.gitcommit) TARBALL_GIT_REV := $(shell cat $(YOSYS_SRC)/.gitcommit)
ifeq ($(TARBALL_GIT_REV),$$Format:%h$$) ifneq ($(findstring Format:,$(TARBALL_GIT_REV)),)
GIT_REV := $(shell GIT_DIR=$(YOSYS_SRC)/.git git rev-parse --short=9 HEAD || echo UNKNOWN) GIT_REV := $(shell GIT_DIR=$(YOSYS_SRC)/.git git rev-parse --short=9 HEAD || echo UNKNOWN)
else else
GIT_REV := $(TARBALL_GIT_REV) GIT_REV := $(TARBALL_GIT_REV)
@ -778,10 +778,10 @@ check-git-abc:
exit 1; \ exit 1; \
elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^ '; then \ elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^ '; then \
exit 0; \ exit 0; \
elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && ! grep -q '\$$Format:%h\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \ elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && ! grep -q '\$$Format:%[hH]\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \
echo "'abc' comes from a tarball. Continuing."; \ echo "'abc' comes from a tarball. Continuing."; \
exit 0; \ exit 0; \
elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && grep -q '\$$Format:%h\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \ elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && grep -q '\$$Format:%[hH]\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \
echo "Error: 'abc' is not configured as a git submodule."; \ echo "Error: 'abc' is not configured as a git submodule."; \
echo "To resolve this:"; \ echo "To resolve this:"; \
echo "1. Back up your changes: Save any modifications from the 'abc' directory to another location."; \ echo "1. Back up your changes: Save any modifications from the 'abc' directory to another location."; \

2
abc

@ -1 +1 @@
Subproject commit 237d81397fcc85dd3894bf1a449d2955cd3df02d Subproject commit 28d955ca97a1c4be3aed4062aec0241a734fac5d