[rtems-source-builder commit] 6/7: Use RTEMS 6 tools

[Sebastian Huber]

Module:    rtems-source-builder
Branch:    master
Commit:    c7516528c5236ce52aa71c489e0bea519c0d3c04
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=c7516528c5236ce52aa71c489e0bea519c0d3c04

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jun 30 09:38:40 2020 +0200

6/7: Use RTEMS 6 tools

---

 rtems/config/6/rtems-default.bset    |  2 +-
 rtems/config/6/rtems-epiphany.bset   |  2 +-
 rtems/config/7/rtems-default.bset    |  2 +-
 rtems/config/tools/rtems-tools-6.cfg | 43 ++++++++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset
index 86830ba..9b09e8e 100644
--- a/rtems/config/6/rtems-default.bset
+++ b/rtems/config/6/rtems-default.bset
@@ -12,4 +12,4 @@ tools/rtems-gdb-head
 
 tools/rtems-binutils-head
 tools/rtems-gcc-10-newlib-head
-tools/rtems-tools-5-1
+tools/rtems-tools-6
diff --git a/rtems/config/6/rtems-epiphany.bset b/rtems/config/6/rtems-epiphany.bset
index bcaeeb4..706c778 100644
--- a/rtems/config/6/rtems-epiphany.bset
+++ b/rtems/config/6/rtems-epiphany.bset
@@ -14,4 +14,4 @@ devel/expat-2.1.0-1
 tools/rtems-binutils-head
 tools/rtems-gcc-10-newlib-head
 tools/rtems-gdb-7.8.1-1
-tools/rtems-tools-5-1
+tools/rtems-tools-6
diff --git a/rtems/config/7/rtems-default.bset b/rtems/config/7/rtems-default.bset
index 7d51c6c..b37d75f 100644
--- a/rtems/config/7/rtems-default.bset
+++ b/rtems/config/7/rtems-default.bset
@@ -10,4 +10,4 @@ tools/rtems-gdb-head
 
 tools/rtems-binutils-head
 tools/rtems-gcc-head-newlib-head
-tools/rtems-tools-5-1
+tools/rtems-tools-6
diff --git a/rtems/config/tools/rtems-tools-6.cfg b/rtems/config/tools/rtems-tools-6.cfg
new file mode 100644
index 0000000..e50862a
--- /dev/null
+++ b/rtems/config/tools/rtems-tools-6.cfg
@@ -0,0 +1,43 @@
+#
+# RTEMS Tools for 6.
+#
+
+#
+# The RTEMS Tools version is set to the RSB version or the RTEMS version.
+#
+%if %{rsb_released}
+ %define rtems_tools_version %{rsb_version}
+ %define rtems_tools_source rtems-tools-%{rtems_tools_version}
+ %define rtems_tools_ext xz
+%else
+ %define rtems_tools_version 351bb7e41d15a18ed388b005f8c21614a272e8c0
+ %define rtems_tools_ext bz2
+%endif
+
+%define rtems_tools_source rtems-tools-%{rtems_tools_version}
+%source set rtems-tools https://git.rtems.org/rtems-tools/snapshot/%{rtems_tools_source}.tar.%{rtems_tools_ext}
+%hash   sha512 rtems-tools-%{rtems_tools_version}.tar.bz2 f0c4366bcb6eaa5e65476d197236c5873cb1f573ccdc2d2299272923a7e6a05479f63eaa904672c7f2a667a5c06f91a3389979f62d3eceff48cd48bdc72f6924
+
+#
+# Optionally enable/disable building the RTEMS Tools via the command line.
+#
+%if %{defined with_rtems_tools}
+ %define rtems_tools_build 1
+%endif
+%if %{defined without_rtems_tools}
+ %define rtems_tools_build 0
+%endif
+
+#
+# Build by default.
+#
+%if ! %{defined rtems_tools_build}
+ %define rtems_tools_build 1
+%endif
+
+%if %{rtems_tools_build}
+ #
+ # The RTEMS Tools build instructions.
+ #
+ %include tools/rtems-tools-common-1.cfg
+%endif