From 1dbeb7679a75c67c1db9cb8ea871d7f0be1c5192 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 14 Feb 2023 15:44:34 +1100
Subject: Fix version dependence in package lists

---
 rtems-release               | 1 +
 rtems-release-branch        | 4 +++-
 rtems-release-defaults      | 5 -----
 rtems-release-kernel        | 1 +
 rtems-release-package-start | 4 ++++
 rtems-release-rsb-version   | 1 +
 rtems-release-sources       | 3 ++-
 rtems-release-tag           | 3 ++-
 rtems-release-test          | 1 +
 9 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/rtems-release b/rtems-release
index af85b8a..d4b6527 100755
--- a/rtems-release
+++ b/rtems-release
@@ -87,6 +87,7 @@ fi
 version=$1
 revision=$2
 
+. ${release_top}/rtems-release-package-lists
 . ${release_top}/rtems-release-version
 
 echo "RTEMS Release, v${release}"
diff --git a/rtems-release-branch b/rtems-release-branch
index cc5905d..25cea65 100755
--- a/rtems-release-branch
+++ b/rtems-release-branch
@@ -60,7 +60,9 @@ usage() {
  exit 1
 }
 
-. ./rtems-release-version
+. ${release_top}/rtems-release-package-lists
+. ${release_top}/rtems-release-version
+
 #
 # Option defaults
 #
diff --git a/rtems-release-defaults b/rtems-release-defaults
index 1f8b2fe..b558a45 100755
--- a/rtems-release-defaults
+++ b/rtems-release-defaults
@@ -113,8 +113,3 @@ pandoc_std_opts="-f markdown_phpextra+grid_tables+multiline_tables+simple_tables
 now=$(date +"%d %B %Y")
 now_year=$(date +"%Y")
 export now now_year
-
-#
-# Generate the package and repo lists
-#
-. ${release_top}/rtems-release-package-lists
diff --git a/rtems-release-kernel b/rtems-release-kernel
index 20a4a6d..09c7ac2 100755
--- a/rtems-release-kernel
+++ b/rtems-release-kernel
@@ -54,6 +54,7 @@ revision=$3
 release_url=$4
 toptop=$5
 
+. ${release_top}/rtems-release-package-lists
 . ${release_top}/rtems-release-version
 
 prefix=${package}-${release}
diff --git a/rtems-release-package-start b/rtems-release-package-start
index 47a4005..32cc16b 100755
--- a/rtems-release-package-start
+++ b/rtems-release-package-start
@@ -48,6 +48,10 @@ package=$1
 version=$2
 revision=$3
 release_url=$4
+
+. ${release_top}/rtems-release-package-lists
+. ${release_top}/rtems-release-version
+
 if [ $# -eq 5 ]; then
  if [ ! -x ${top}/$5 ]; then
   echo "error: cannot find the worker: $4"
diff --git a/rtems-release-rsb-version b/rtems-release-rsb-version
index 54db769..b81894b 100755
--- a/rtems-release-rsb-version
+++ b/rtems-release-rsb-version
@@ -50,6 +50,7 @@ revision=$3
 release_url=$4
 toptop=$5
 
+. ${release_top}/rtems-release-package-lists
 . ${release_top}/rtems-release-version
 
 prefix=${package}-${release}
diff --git a/rtems-release-sources b/rtems-release-sources
index 8fc60fa..93f0faf 100755
--- a/rtems-release-sources
+++ b/rtems-release-sources
@@ -53,7 +53,8 @@ release_url=$3
 
 package=rtems-source-builder
 
-. ./rtems-release-version
+. ${release_top}/rtems-release-package-lists
+. ${release_top}/rtems-release-version
 
 prefix=${package}-${release}
 
diff --git a/rtems-release-tag b/rtems-release-tag
index bd4e9db..ec3c0f4 100755
--- a/rtems-release-tag
+++ b/rtems-release-tag
@@ -102,7 +102,8 @@ user=$1
 version=$2
 revision=$3
 
-. ./rtems-release-version
+. ${release_top}/rtems-release-package-lists
+. ${release_top}/rtems-release-version
 
 echo "] RTEMS Release Tag, v${release}"
 
diff --git a/rtems-release-test b/rtems-release-test
index 07bf032..4265362 100755
--- a/rtems-release-test
+++ b/rtems-release-test
@@ -122,6 +122,7 @@ fi
 version=$1
 revision=$2
 
+. ${release_top}/rtems-release-package-lists
 . ${release_top}/rtems-release-version
 
 bsets=
-- 
cgit v1.2.3