mirror of https://github.com/YosysHQ/yosys.git
Makefile: reproducible .gitcommit
This commit is contained in:
parent
b08688f711
commit
9d15f1d6ac
|
@ -1 +1 @@
|
||||||
$Format:%h$
|
$Format:%H$
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -150,7 +150,7 @@ YOSYS_VER := 0.43+3
|
||||||
# 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)
|
||||||
|
@ -773,10 +773,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."; \
|
||||||
|
|
Loading…
Reference in New Issue