From 4aa7034e6e9dfe3a79bd238abef03294d186dee1 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 28 Feb 2020 15:32:08 +1100
Subject: Add a release_url to the arguments for the various steps.

- The release_url can be used for testing or to allow deployment
  by setting the top level URL the source is fetched from.
- Move libbsd up in the order so the RSB can get a hash for it.
---
 rtems-release-rsb-version | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'rtems-release-rsb-version')

diff --git a/rtems-release-rsb-version b/rtems-release-rsb-version
index 62abb74..c960dfc 100755
--- a/rtems-release-rsb-version
+++ b/rtems-release-rsb-version
@@ -43,17 +43,18 @@ echo "RTEMS Release RSB Versioning, v${rtems_release_version}"
 . ${release_top}/rtems-release-defaults
 
 #
-# The package, version and revision.
+# The package, version, revision and release URL.
 #
-if [ $# -ne 4 ]; then
+if [ $# -ne 5 ]; then
     echo "error: must be arguments, the package, version," \
-	 "release and the top directory."
+	 "release, release URL and the top directory."
  exit 1
 fi
 package=$1
 version=$2
 revision=$3
-toptop=$4
+release_url=$4
+toptop=$5
 
 release=${version}.${revision}
 prefix=${package}-${release}
@@ -66,15 +67,15 @@ echo "Release: ${release}"
 #
 if [ \( $(echo "${release}" | sed -e 's/.*rc.*/yes/') = "yes" \) -o \
      \( $(echo "${release}" | sed -e 's/.*RC.*/yes/') = "yes" \) ]; then
- rp="${rtems_release_url}/${version}/rc/${release}"
- rp="${rp},${rtems_release_url}/${version}/rc/${release}/sources"
+ rp="${release_url}/${version}/rc/${release}"
+ rp="${rp},${release_url}/${version}/rc/${release}/sources"
 elif [ \( $(echo "${release}" | sed -e 's/.*-m.*/yes/') = "yes" \) ]; then
  revision=$(echo "${release}" | sed -e 's/-m.*//')
- rp="${rtems_release_url}/${version}/${revision}/${release}"
- rp="${rp},${rtems_release_url}/${version}/${revision}/${release}/sources"
+ rp="${release_url}/${version}/${revision}/${release}"
+ rp="${rp},${release_url}/${version}/${revision}/${release}/sources"
 else
- rp="${rtems_release_url}/${version}/${release}"
- rp="${rp},${rtems_release_url}/${version}/${release}/sources"
+ rp="${release_url}/${version}/${release}"
+ rp="${rp},${release_url}/${version}/${release}/sources"
 fi
 echo "release_path = ${rp}" >> ${prefix}/VERSION
 
@@ -86,7 +87,7 @@ checksum=sha512
 #
 echo >> ${prefix}/VERSION
 echo "[hashes]" >> ${prefix}/VERSION
-for p in rtems-tools rtems
+for p in ${rtems_rsb_hash}
 do
   file=${p}-${release}.tar.xz
   hash=$(${checksum} -q ${toptop}/${release}/${file})
-- 
cgit v1.2.3