Anastasia Klimchuk submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved
Makefile: Fix version string for non-Git builds

Match the version string for `make` builds to that of `meson` builds
from both Git- and non-Git (release or current snapshot) source trees.

Change-Id: I8694e618878823a9e96b1f2bcfa63f6c71d3c2ed
Signed-off-by: Anton Samsonov <devel@zxlab.ru>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/79152
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
---
M Makefile
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a36e575..9ce5906 100644
--- a/Makefile
+++ b/Makefile
@@ -399,8 +399,10 @@

VERSION ?= $(shell cat ./VERSION)
VERSION_GIT ?= $(shell git describe 2>/dev/null)
-ifdef VERSION_GIT
+ifneq ($(VERSION_GIT),)
VERSION := "$(VERSION) (git:$(VERSION_GIT))"
+else
+ VERSION := "$(VERSION)"
endif

# No spaces in release names unless set explicitly

To view, visit change 79152. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: I8694e618878823a9e96b1f2bcfa63f6c71d3c2ed
Gerrit-Change-Number: 79152
Gerrit-PatchSet: 7
Gerrit-Owner: Anton Samsonov <devel@zxlab.ru>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Angel Pons <th3fanbus@gmail.com>
Gerrit-CC: Anton Samsonov <avscomputing@gmail.com>
Gerrit-CC: Anton Samsonov <contact-launchpad@zxlab.ru>
Gerrit-MessageType: merged