On 08/05/16 21:33, Anders Roxell wrote:
On 2016-08-03 11:40, Maxim Uvarov wrote:
Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
---
scripts/git_hash.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh
index 336eb01..83123f4 100755
--- a/scripts/git_hash.sh
+++ b/scripts/git_hash.sh
@@ -7,7 +7,7 @@ fi
ROOTDIR=${1}
if [ -d ${ROOTDIR}/.git ]; then
- hash=$(git --git-dir=${ROOTDIR}/.git describe --match
'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'\
+ hash=$(git --git-dir=${ROOTDIR}/.git describe --match
'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-monarch_lts'\
If we change the tag from v1.11.0.0-monarch_lts to v1.11.0.0_monarch_lts
we don't have to add release specific patches to specify the name.
Cheers,
Anders
Tags in master branch are:
v1.12.0
..
v1.13.0
...
v1.14.0
tags in monarch_lts branch are:
v1.11.0.0-monarch_lts
v1.11.1.0-monarch_lts
v1.11.2.0-monarch_lts
v1.11.3.0-monarch_lts
We need this change to not overlap with master branch.
Maxim.
