From 9e98aba0c8174272899945a366618a8aa26c234f Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 9 Feb 2023 16:50:35 +1100
Subject: Move packages into a separate file to better handled version
 differences

- Add the extra packages for 5 and 6 to the base set
---
 notes/rtems-notes-5.3.md    |  1 +
 notes/rtems-notes-5.4.md    |  1 +
 notes/rtems-notes-6.2.md    |  1 +
 rtems-release               |  2 +-
 rtems-release-defaults      | 24 ++++++------------
 rtems-release-package-lists | 59 +++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 70 insertions(+), 18 deletions(-)
 create mode 100644 notes/rtems-notes-5.3.md
 create mode 100644 notes/rtems-notes-5.4.md
 create mode 100644 notes/rtems-notes-6.2.md
 create mode 100755 rtems-release-package-lists

diff --git a/notes/rtems-notes-5.3.md b/notes/rtems-notes-5.3.md
new file mode 100644
index 0000000..ab5cafa
--- /dev/null
+++ b/notes/rtems-notes-5.3.md
@@ -0,0 +1 @@
+## RTEMS 5.3 Release Notes
diff --git a/notes/rtems-notes-5.4.md b/notes/rtems-notes-5.4.md
new file mode 100644
index 0000000..ab5cafa
--- /dev/null
+++ b/notes/rtems-notes-5.4.md
@@ -0,0 +1 @@
+## RTEMS 5.3 Release Notes
diff --git a/notes/rtems-notes-6.2.md b/notes/rtems-notes-6.2.md
new file mode 100644
index 0000000..ab5cafa
--- /dev/null
+++ b/notes/rtems-notes-6.2.md
@@ -0,0 +1 @@
+## RTEMS 5.3 Release Notes
diff --git a/rtems-release b/rtems-release
index 0cce91d..af85b8a 100755
--- a/rtems-release
+++ b/rtems-release
@@ -87,7 +87,7 @@ fi
 version=$1
 revision=$2
 
-. ./rtems-release-version
+. ${release_top}/rtems-release-version
 
 echo "RTEMS Release, v${release}"
 
diff --git a/rtems-release-defaults b/rtems-release-defaults
index 454d4ea..1f8b2fe 100755
--- a/rtems-release-defaults
+++ b/rtems-release-defaults
@@ -82,23 +82,8 @@ rtems_readme_release_notes=
 rtems_release_conf=
 rtems_release_url=https://ftp.rtems.org/pub/rtems/releases
 rtems_rsb_hash="rtems-tools rtems"
-
-#
-# RTEMS packages
-#
-rtems_packages="rtems-source-builder rtems rtems-tools rtems-libbsd"
-rtems_packages="${rtems_packages} rtems-examples rtems-docs"
-
-#
-# RTEMS repositories
-#
-rtems_repos=""
-for r in ${rtems_packages}
-do
-  rtems_repos="${rtems_repos} "${r}.git
-done
-
-rtems_repos="${rtems_repos} rtems-release.git"
+rtems_packages=
+rtems_repos=
 
 #
 # Where we collect the sources and docs.
@@ -128,3 +113,8 @@ 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-package-lists b/rtems-release-package-lists
new file mode 100755
index 0000000..c73ad60
--- /dev/null
+++ b/rtems-release-package-lists
@@ -0,0 +1,59 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2023 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# RTEMS packages
+#
+rtems_packages="rtems-source-builder rtems rtems-tools"
+rtems_packages="${rtems_packages} rtems-examples rtems-docs"
+
+#
+# RTEMS 5 and later
+#
+if [ ${version} -ge 5 ]; then
+  rtems_packages="${rtems_packages} rtems-libbsd"
+fi
+
+#
+# RTEMS 6 and later
+#
+if [ ${version} -ge 6 ]; then
+  rtems_packages="${rtems_packages} rtems_waf rtems-net-legacy rtems-lwip"
+fi
+
+#
+# RTEMS repositories
+#
+rtems_repos=
+for r in ${rtems_packages}
+do
+  rtems_repos="${rtems_repos} "${r}.git
+done
+rtems_repos="${rtems_repos} rtems-release.git"
-- 
cgit v1.2.3