aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch')
-rw-r--r--package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch
index 745e615074..0519598a28 100644
--- a/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch
+++ b/package/boot/arm-trusted-firmware-mvebu/patches-a3700-utils/001-version.patch
@@ -1,13 +1,14 @@
diff --git a/wtmi/sys_init/Makefile b/wtmi/sys_init/Makefile
--- a/wtmi/sys_init/Makefile
+++ b/wtmi/sys_init/Makefile
-@@ -51,7 +51,8 @@ ECHO = @echo
+@@ -51,8 +51,8 @@ ECHO = @echo
SED = @sed
LOCAL_VERSION_STRING ?= -armada
--BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h")
-+A3700_UTILS_COMMIT_ID ?= $(shell git log -n 1 --pretty=format:"%h")
-+BUILD_STRING := $(A3700_UTILS_COMMIT_ID)
- VERSION_STRING := $(LOCAL_VERSION_STRING)-$(BUILD_STRING)
+-BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h" && (git diff-index --quiet HEAD || echo -dirty))
+-VERSION_STRING := $(LOCAL_VERSION_STRING)-$(BUILD_STRING)
++A3700_UTILS_COMMIT_ID ?= $(shell git log -n 1 --pretty=format:"%h" && (git diff-index --quiet HEAD || echo -dirty))
++VERSION_STRING := $(LOCAL_VERSION_STRING)-$(A3700_UTILS_COMMIT_ID)
CPUOPTS = -mthumb -mcpu=cortex-m3 -mlittle-endian
+ BINPATH = build