From 78d60ffe01e6c1345846cd10e1c33e25036ec27d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 2 Dec 2016 15:32:59 +0100 Subject: [PATCH] makebranch.sh: use YY.MM-CURRENT designation for branch versions Also use "Release Management" as Git author. Signed-off-by: Jo-Philipp Wich --- phase1/makebranch.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/phase1/makebranch.sh b/phase1/makebranch.sh index 016f3a8..ac7bbe2 100755 --- a/phase1/makebranch.sh +++ b/phase1/makebranch.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -git_author="Release System" +git_author="Release Management" git_email="lede-dev@lists.infradead.org" base_url="http://downloads.lede-project.org/releases" @@ -117,13 +117,12 @@ done < feeds.conf.default > feeds.conf.branch && \ mv feeds.conf.branch feeds.conf.default sed -e 's!^RELEASE:=.*!RELEASE:='"$codename"'!g' \ - -e 's!\(VERSION_NUMBER:=\$(if .*\),[^,]*)!\1,'"$version-HEAD"')!g' \ - -e 's!\(VERSION_CODE:=\$(if .*\),[^,]*)!\1,$(REVISION))!g' \ - -e 's!\(VERSION_REPO:=\$(if .*\),[^,]*)!\1,'"$base_url/$version-HEAD"')!g' \ + -e 's!\(VERSION_NUMBER:=\$(if .*\),[^,]*)!\1,'"$version-CURRENT"')!g' \ + -e 's!\(VERSION_REPO:=\$(if .*\),[^,]*)!\1,'"$base_url/$version-CURRENT"')!g' \ include/version.mk > include/version.branch && \ mv include/version.branch include/version.mk -sed -e 's!http://downloads.lede-project.org/[^"]*!'"$base_url/$version-HEAD"'!g' \ +sed -e 's!http://downloads.lede-project.org/[^"]*!'"$base_url/$version-CURRENT"'!g' \ package/base-files/image-config.in > package/base-files/image-config.branch && \ mv package/base-files/image-config.branch package/base-files/image-config.in -- 2.30.2