summaryrefslogtreecommitdiffstats
path: root/rtems-release-package
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2020-06-26 13:30:56 +1000
committerChris Johns <chrisj@rtems.org>2020-06-26 13:30:56 +1000
commitcd4a770aba4fc1028a551bf2c32d1d826d581b2f (patch)
tree7255723b554d0d0a93a27b109a666e5b47c2f329 /rtems-release-package
parentUpdate the tag script to match the branch script (diff)
downloadrtems-release-cd4a770aba4fc1028a551bf2c32d1d826d581b2f.tar.bz2
Use the libbsd FreeBSD release branch for a release
Diffstat (limited to 'rtems-release-package')
-rwxr-xr-xrtems-release-package4
1 files changed, 3 insertions, 1 deletions
diff --git a/rtems-release-package b/rtems-release-package
index b291673..7fe5090 100755
--- a/rtems-release-package
+++ b/rtems-release-package
@@ -68,8 +68,10 @@ stamped_tar=${prefix}-unstamped
cd ${git_local}
echo "git fetch origin"
git fetch origin
+ # Map the branch name to a specific package branch name
+ branch=$(rtems_map_branch ${package} ${version})
# Get the remote branch. If the release branch is not found use master.
- remote_branch=$(git branch --remote | grep ${version} | tr -d "[:space:]")
+ remote_branch=$(git branch --remote | grep "${branch}$" | tr -d "[:space:]")
if [ -z "${remote_branch}" ]; then
remote_branch="master"
fi