Switch default to version info from Git
We gave an existing `versioninfo.inc` priority over more accurate
version info from Git. Now that we allow checked in version info,
it makes sense to switch the default to Git. This way, we get the
best of both.
Change-Id: If057442a5a52409f35538dc7738ae5da2d03c813
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/72445
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
diff --git a/Makefile b/Makefile
index dde09a5..665e96c 100644
--- a/Makefile
+++ b/Makefile
@@ -410,12 +410,11 @@
CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
-# versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and
-# imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will
-# be obtained using util/getrevision.sh, which is the common case during development.
--include versioninfo.inc
-VERSION ?= $(shell ./util/getrevision.sh --revision)
-MAN_DATE ?= $(shell ./util/getrevision.sh --date $(PROGRAM).8.tmpl 2>/dev/null)
+# By default version information will be fetched from Git if available.
+# Otherwise, versioninfo.inc stores the metadata required to build a
+# packaged flashrom. It is generated by the export, tag and branch rules.
+VERSION := $(shell ./util/getversion.sh --version)
+MAN_DATE := $(shell ./util/getversion.sh --man-date)
SCMDEF := -D'FLASHROM_VERSION="$(VERSION)"'