[rtems-release commit] Revert "Support new RTEMS build system"

Chris Johns chrisj at rtems.org
Thu Nov 17 04:07:39 UTC 2022


Module:    rtems-release
Branch:    master
Commit:    6a076cfc558e6c55215a4d4072fa0978a9bb62ca
Changeset: http://git.rtems.org/rtems-release/commit/?id=6a076cfc558e6c55215a4d4072fa0978a9bb62ca

Author:    Chris Johns <chrisj at rtems.org>
Date:      Sat Aug 13 16:42:10 2022 +1000

Revert "Support new RTEMS build system"

This reverts commit 3813b23945cc81108b77a20315310c42fbc588e4.

We need to support autoconf so it cannot be deleted

---

 rtems-release-kernel | 73 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 11 deletions(-)

diff --git a/rtems-release-kernel b/rtems-release-kernel
index 66ee589..188fc39 100755
--- a/rtems-release-kernel
+++ b/rtems-release-kernel
@@ -63,19 +63,63 @@ echo "] Package: ${package}"
 echo "] Release: ${release}"
 
 #
-# Update RTEMS version, collect the BSPs, and update the README.
+# Unpack the released RSB.
+#
+rsb=rtems-source-builder-${release}
+echo "tar ${comp_tar}xf ../${rsb}.tar.${comp_ext}"
+tar ${comp_tar}xf ../${rsb}.tar.${comp_ext}
+
+#
+# Build autoconf and automake.
+#
+cd ${rsb}/rtems
+../source-builder/sb-set-builder --without-release-url \
+				 --prefix=${top}/at ${version}/rtems-autotools
+cd ../..
+
+#
+# Set the path to the autotools.
+#
+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}
- 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}
+ echo "] Set the version in the build system.."
+ for f in $(find . -name version.m4)
+ do
+  echo "] Generating ${f}"
+  cat <<EOF > ${f}
+dnl Autogenerated for RTEMS release: ${release} (${release_ver_rel_minor})
+AC_DEFUN([RTEMS_VERSIONING],
+m4_define([_RTEMS_VERSION],[${release_ver_rel_minor}]))
+dnl RTEMS API Version
+m4_define([_RTEMS_API],[${version}])
+EOF
+ done
+ echo "] Bootstrapping RTEMS"
+  ./bootstrap -c
+ if [ ${version} -lt 5 ]; then
+  ./bootstrap -p
+  ${top}/${rsb}/source-builder/sb-bootstrap
+ else
+  ./rtems-bootstrap
+ fi
+ echo "] Cleaning autom4te.cache"
+ rm -rf $(find . -name autom4te.cache)
  echo "] Generate ARCH-BSP.txt"
  ./rtems-bsps -m > ${toptop}/ARCH-BSP.md
  echo "] Generate README"
@@ -87,6 +131,13 @@ cd ${prefix}
  rm -r README.tmp
  cd ..
 
+#
+# Clean up.
+#
+rm -rf ${rsb} ${at}
+
+echo "] Bootstrap complete."
+
 #
 # Only build doxygen output if present on the system.
 #



More information about the vc mailing list