diff options
author | Chris Johns <chrisj@rtems.org> | 2020-06-26 13:30:56 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2020-06-26 13:32:07 +1000 |
commit | 01d2cca6db5ee47423798ab16711c7936d57cc83 (patch) | |
tree | 7255723b554d0d0a93a27b109a666e5b47c2f329 | |
parent | Update the tag script to match the branch script (diff) | |
download | rtems-release-01d2cca6db5ee47423798ab16711c7936d57cc83.tar.bz2 |
Use the libbsd FreeBSD release branch for a release
-rwxr-xr-x | rtems-release-defaults | 5 | ||||
-rwxr-xr-x | rtems-release-package | 4 | ||||
-rwxr-xr-x | 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 +} |