[rtems-release commit] Use the libbsd FreeBSD release branch for a release

[Chris Johns]

Module:    rtems-release
Branch:    master
Commit:    cd4a770aba4fc1028a551bf2c32d1d826d581b2f
Changeset: http://git.rtems.org/rtems-release/commit/?id=cd4a770aba4fc1028a551bf2c32d1d826d581b2f

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Jun 26 13:30:56 2020 +1000

Use the libbsd FreeBSD release branch for a release

---

 rtems-release-defaults      |  5 +++++
 rtems-release-package       |  4 +++-
 rtems-release-package-start | 19 +++++++++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/rtems-release-defaults b/rtems-release-defaults
index f592f8a..602530f 100755
--- a/rtems-release-defaults
+++ b/rtems-release-defaults
@@ -113,3 +113,8 @@ fi
 if [ ${rtems_libbsd} = yes ]; then
  rtems_rsb_hash="${rtems_rsb_hash} rtems-libbsd"
 fi
+
+#
+# Libbsd FreeBSD release version
+#
+rtems_libbsd_release=12
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
diff --git a/rtems-release-package-start b/rtems-release-package-start
index 5a86621..776db22 100755
--- a/rtems-release-package-start
+++ b/rtems-release-package-start
@@ -82,8 +82,6 @@ fi
 
 workspace=ws-${package}
 
-checksum=sha512
-
 echo "Package: ${package}"
 echo "Release: ${release}"
 if [ ${rtems_git_repo} = yes ]; then
@@ -106,3 +104,20 @@ cd ${release}
 rm -rf ${workspace}
 mkdir ${workspace}
 cd ${workspace}
+
+#
+# Function to map branch names based on package.
+#
+rtems_map_branch()
+{
+ # $1=package
+ # $2=branch
+ case "$1" in
+  rtems-libbsd)
+   echo "$2-freebsd-${rtems_libbsd_release}"
+   ;;
+  *)
+   echo "$1"
+   ;;
+ esac
+}