From: Chris Johns <chr...@rtems.org>
---
rtems-release-4.10-conf | 2 ++
rtems-release-4.11-conf | 2 ++
rtems-release-5-conf | 2 ++
rtems-release-defaults | 2 ++
rtems-release-kernel | 13 +++----------
rtems-release-notes | 2 +-
.../rtems-release-notes-coverpage.html.in | 2 +-
rtems-release-package-lists | 4 +++-
8 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/rtems-release-4.10-conf b/rtems-release-4.10-conf
index 1e29f78..cb71d43 100755
--- a/rtems-release-4.10-conf
+++ b/rtems-release-4.10-conf
@@ -34,6 +34,8 @@
#
rtems_waf=no
rtems_libbsd=no
+rtems_net_legacy=no
+rtems_net_services=no
rtems_docs=no
rtems_release_notes=no
rtems_readme_release_notes=
diff --git a/rtems-release-4.11-conf b/rtems-release-4.11-conf
index 9fe957a..aceebc8 100755
--- a/rtems-release-4.11-conf
+++ b/rtems-release-4.11-conf
@@ -33,3 +33,5 @@
# The script is the overridded configuration for 4.11.
#
rtems_waf=no
+rtems_net_legacy=no
+rtems_net_services=no
diff --git a/rtems-release-5-conf b/rtems-release-5-conf
index c42ad55..6da7d27 100755
--- a/rtems-release-5-conf
+++ b/rtems-release-5-conf
@@ -33,3 +33,5 @@
# The script is the overridded configuration for 5.
#
rtems_waf=no
+rtems_net_legacy=no
+rtems_net_services=no
diff --git a/rtems-release-defaults b/rtems-release-defaults
index b558a45..4b6abba 100755
--- a/rtems-release-defaults
+++ b/rtems-release-defaults
@@ -72,6 +72,8 @@ comp_tar=J
rtems_waf=yes
rtems_examples=yes
rtems_libbsd=yes
+rtems_net_legacy=yes
+rtems_net_services=yes
rtems_docs=yes
rtems_docs_required=yes
rtems_docs_build=sphinx
diff --git a/rtems-release-kernel b/rtems-release-kernel
index 09c7ac2..e25129c 100755
--- a/rtems-release-kernel
+++ b/rtems-release-kernel
@@ -106,16 +106,9 @@ cd ${prefix}
# Waf build system. Update RTEMS version and collect the BSPs
#
echo "] RTEMS Build System: waf"
- f="spec/build/cpukit/optvermaj.yml"
- echo "] Update ${f}"
- sed -i "s/- get-string-command-line:.*/- get-string-command-line:
'${version}'/" ${f}
- f="spec/build/cpukit/optvermin.yml"
- echo "] Update ${f}"
- minor=$(echo ${revision} | sed 's/-.*//')
- sed -i "s/- set-value:.*/- set-value: '${minor}'/" ${f}
- f="spec/build/cpukit/optverrev.yml"
- echo "] Update ${f}"
- sed -i "s/- set-value:.*/- set-value: '0'/" ${f}
+ f="VERSION"
+ echo "] Creating ${f}: ${release}"
+ echo "RTEMS_VERSION = ${release}" > ${f}
else
#
# Autoconf build system. Bootstrap RTEMS
diff --git a/rtems-release-notes b/rtems-release-notes
index c1d280d..659a706 100755
--- a/rtems-release-notes
+++ b/rtems-release-notes
@@ -68,7 +68,7 @@ title="RTEMS Release Notes builder"
#
ws_pwd=${PWD}
-echo "] Creating release notes"
+echo "] Creating release notes for ${release}"
echo "] Generate release notes markdown"
#
diff --git
a/rtems-release-notes-coverpage/rtems-release-notes-coverpage.html.in
b/rtems-release-notes-coverpage/rtems-release-notes-coverpage.html.in
index 422e8bd..4f9350a 100644
--- a/rtems-release-notes-coverpage/rtems-release-notes-coverpage.html.in
+++ b/rtems-release-notes-coverpage/rtems-release-notes-coverpage.html.in
@@ -46,7 +46,7 @@
</div>
<footer class="footer">
<div class="container">
- Copyright @TEAR@ RTEMS Project
+ Copyright @YEAR@ RTEMS Project
</div>
</footer>
</body>
diff --git a/rtems-release-package-lists b/rtems-release-package-lists
index c73ad60..55bfedb 100755
--- a/rtems-release-package-lists
+++ b/rtems-release-package-lists
@@ -45,7 +45,9 @@ fi
# RTEMS 6 and later
#
if [ ${version} -ge 6 ]; then
- rtems_packages="${rtems_packages} rtems_waf rtems-net-legacy rtems-lwip"
+ rtems_packages="${rtems_packages} rtems_waf"
+ rtems_packages="${rtems_packages} rtems-net-legacy rtems-lwip"
+ rtems_packages="${rtems_packages} rtems-net-services"
fi
#
--
2.37.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
