From b373a6ce38b91759fb558c46ccf419f2896593f7 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Mon, 25 May 2020 18:26:10 -0700 Subject: [PATCH] Makefile: Support getting xemu version info in archive --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 896c33a000..70d6e48ca4 100644 --- a/Makefile +++ b/Makefile @@ -497,16 +497,20 @@ qemu-version.h: FORCE XEMU_DATE := $(shell date -u ) -XEMU_COMMIT := $(if $(PKGVERSION),$(PKGVERSION),$(shell \ +XEMU_COMMIT := $(shell \ cd $(SRC_PATH); \ if test -e .git; then \ git rev-parse HEAD 2>/dev/null | tr -d '\n'; \ - fi)) + elif test -e XEMU_COMMIT; then \ + cat XEMU_COMMIT; \ + fi) XEMU_BRANCH := $(shell \ cd $(SRC_PATH); \ if test -e .git; then \ git symbolic-ref --short HEAD; \ + elif test -e XEMU_BRANCH; then \ + cat XEMU_BRANCH; \ fi) XEMU_VERSION := $(shell \