From: Jo-Philipp Wich Date: Fri, 2 Dec 2016 21:18:47 +0000 (+0100) Subject: makebranch.sh: use -SNAPSHOT instead of -CURRENT for untagged branch builds X-Git-Tag: v1~206 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ad83c1fc88ab4b3283ee0a99d327d50cd7bf37ce;p=buildbot.git makebranch.sh: use -SNAPSHOT instead of -CURRENT for untagged branch builds Signed-off-by: Jo-Philipp Wich --- diff --git a/phase1/makebranch.sh b/phase1/makebranch.sh index ac7bbe2..e92c04c 100755 --- a/phase1/makebranch.sh +++ b/phase1/makebranch.sh @@ -117,12 +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-CURRENT"')!g' \ - -e 's!\(VERSION_REPO:=\$(if .*\),[^,]*)!\1,'"$base_url/$version-CURRENT"')!g' \ + -e 's!\(VERSION_NUMBER:=\$(if .*\),[^,]*)!\1,'"$version-SNAPSHOT"')!g' \ + -e 's!\(VERSION_REPO:=\$(if .*\),[^,]*)!\1,'"$base_url/$version-SNAPSHOT"')!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-CURRENT"'!g' \ +sed -e 's!http://downloads.lede-project.org/[^"]*!'"$base_url/$version-SNAPSHOT"'!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