summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-bsp/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch')
-rw-r--r--recipes-bsp/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-bsp/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch b/recipes-bsp/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch
deleted file mode 100644
index be747789..00000000
--- a/recipes-bsp/imx-atf/imx-atf/0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 4123893a8a4d93362a0a36f72134f75436fee457 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Thu, 18 Oct 2018 18:03:46 -0500
4Subject: [PATCH] Allow BUILD_STRING to be set in .revision file.
5
6Upstream-Status: Pending
7
8Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
9---
10 Makefile | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/Makefile b/Makefile
14index 57c4a90..ec49397 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -97,6 +97,9 @@ endif
18
19 # Default build string (git branch and commit)
20 ifeq (${BUILD_STRING},)
21+ BUILD_STRING := $(shell cat .revision 2> /dev/null)
22+endif
23+ifeq (${BUILD_STRING},)
24 BUILD_STRING := $(shell git describe --long --always --dirty --tags 2> /dev/null)
25 endif
26 VERSION_STRING := v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING}
27--
282.7.4
29