[buildbot] maketag.sh: use the output of getver.sh verbatim

LEDE Commits lede-commits at lists.infradead.org
Fri Dec 2 06:36:16 PST 2016


jow pushed a commit to buildbot.git, branch master:
https://git.lede-project.org/19c96ec999bfa80d709aaf0b935468a1e897d7ae

commit 19c96ec999bfa80d709aaf0b935468a1e897d7ae
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Fri Dec 2 15:33:49 2016 +0100

    maketag.sh: use the output of getver.sh verbatim
    
    Do not append Git commit hashes to the getver.sh reported version but take the
    value verbatim. Also change the Git author to "Release Management".
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 phase1/maketag.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/phase1/maketag.sh b/phase1/maketag.sh
index c233e44..3e49ccb 100755
--- a/phase1/maketag.sh
+++ b/phase1/maketag.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-git_author="Release System"
+git_author="Release Management"
 git_email="lede-dev at lists.infradead.org"
 
 base_url="http://downloads.lede-project.org/releases"
@@ -82,7 +82,6 @@ if git rev-parse "v${version}^{tag}" >/dev/null 2>/dev/null; then
 fi
 
 revnum="$(./scripts/getver.sh)"
-githash="$(git log --format=%h -1)"
 
 prev_branch="$(git symbolic-ref -q HEAD)"
 
@@ -128,7 +127,7 @@ done < feeds.conf.default > feeds.conf.tagged && \
 	mv feeds.conf.tagged feeds.conf.default
 
 sed -e 's!\(VERSION_NUMBER:=\$(if .*\),[^,]*)!\1,'"$version"')!g' \
-    -e 's!\(VERSION_CODE:=\$(if .*\),[^,]*)!\1,'"$revnum-$githash"')!g' \
+    -e 's!\(VERSION_CODE:=\$(if .*\),[^,]*)!\1,'"$revnum"')!g' \
     -e 's!\(VERSION_REPO:=\$(if .*\),[^,]*)!\1,'"$base_url/$version"')!g' \
 	include/version.mk > include/version.tagged && \
 		mv include/version.tagged include/version.mk



More information about the lede-commits mailing list