Set ${basis} based on original TAG or BRANCH, not resolved BRANCH.

Change-Id: I567d9fed7003ffa52851c93e690823325ce6192a

1 files changed, 4 insertions, 14 deletions

diff --git a/tcwg-release.sh b/tcwg-release.sh
index beecaf9..daba240 100755
--- a/tcwg-release.sh
+++ b/tcwg-release.sh
@@ -699,6 +699,9 @@ fi
 # If the REMOTE hasn't been specified, default to 'origin'.
 : ${REMOTE:=origin}
 
+# The release notes generation uses this information.
+basis="${BRANCH:+${BRANCH}}${TAG:+${TAG}}"
+
 # Release-Candidates and Releases are both pushed to the release branch
 # since there is a strict linear progression from candidates to releases.
 #
@@ -882,16 +885,6 @@ print_info "${bold}Checking out branch \"${local_branch}\"..."
 pushd $REL_DIR/git 1>/dev/null
 git checkout -B ${local_branch} ${track} 2>/dev/null
 
-# if a tag get the branch:  git branch -a --contains tag
-# otherwise get the branch and use that for TRACK
-# Pass $REL_DIR/git as the gcc source directory for pulling the GCC base version
-# and the FSF version.
-# Determine the basis URL:
-# basis_url="http://snapshots.linaro.org/components/toolchain/gcc-linaro/${basedon}"
-# CANDIDATE, RELEASE, or SNAPSHOT
-
-
-
 popd 1>/dev/null
 
 print_info "${bold}Creating ${SNAPSHOT:+snapshot}${RELEASE:+release}${CANDIDATE:+release candidate} ChangeLog entries..."
@@ -994,10 +987,7 @@ print_info "${bold}Generating release notes into ${REL_DIR}/git/"
 next_series="${SNAPSHOT:+-s}${RELEASE:+-r}${CANDIDATE:+-c}"
 
 set -x
-    python ${mydir}/rn.py ${track} ${next_series} -g ${REL_DIR}/git --date ${DATE}
+    python ${mydir}/rn.py ${basis} ${next_series} -g ${REL_DIR}/git --date ${DATE}
 set +x
 
 popd 1>/dev/null
-
-
-