summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2020-08-14 05:21:22 +1000
committerChris Johns <chrisj@rtems.org>2020-08-15 10:22:06 +1000
commit83ff776dff33938c1240e2141da020dd61134afb (patch)
treeb2c8e70454740aee4e06df56d9dc7c4b20767be5
parentProvide the HTML as browseable from the release. (diff)
downloadrtems-release-83ff776dff33938c1240e2141da020dd61134afb.tar.bz2
Work around version numbering mismatch with the kernel
-rwxr-xr-xrtems-release-kernel15
1 files changed, 13 insertions, 2 deletions
diff --git a/rtems-release-kernel b/rtems-release-kernel
index 16864d2..a4cf7fd 100755
--- a/rtems-release-kernel
+++ b/rtems-release-kernel
@@ -84,6 +84,17 @@ export XPATH=$PATH
export PATH=${top}/at/bin:$PATH
#
+# Massage the version.revision string into major.minor.revision
+#
+release_ver_rel=$(echo ${release} | sed 's/-.*//g')
+dots_plus_one=$(echo ${release_ver_rel} | tr . \\n | wc -l)
+if [ $dots_plus_one -ne 2 ]; then
+ echo "error: invalid release string, only one dot allowed"
+ exit 1
+fi
+release_ver_rel_minor="${release_ver_rel}.0"
+
+#
# Bootstrap RTEMS, collect the BSPs, and update the README.
#
cd ${prefix}
@@ -92,9 +103,9 @@ cd ${prefix}
do
echo " Generating ${f}"
cat <<EOF > ${f}
-dnl Autogenerated for RTEMS release: ${release}
+dnl Autogenerated for RTEMS release: ${release} (${release_ver_rel_minor})
AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[${release}]))
+m4_define([_RTEMS_VERSION],[${release_ver_rel_minor}]))
dnl RTEMS API Version
m4_define([_RTEMS_API],[${version}])
EOF