[PATCH v2] 5: Use a specific RTEMS tools version

[Sebastian Huber]

Download via cgit archive.

Close #3403.
---
 rtems/config/tools/rtems-tools-5-1.cfg      | 28 ++++++++++++++++++++++++++--
 rtems/config/tools/rtems-tools-common-1.cfg | 12 ++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/rtems/config/tools/rtems-tools-5-1.cfg b/rtems/config/tools/rtems-tools-5-1.cfg
index 6efc4e3..19c809d 100644
--- a/rtems/config/tools/rtems-tools-5-1.cfg
+++ b/rtems/config/tools/rtems-tools-5-1.cfg
@@ -7,9 +7,33 @@
 #
 %if %{rsb_released}
  %define rtems_tools_version %{rsb_version}
+%else
+ %define rtems_tools_version ec419a05ee52869a7d5b8712ea8e7a7d74fde096
+ %define rtems_tools_source rtems-tools-%{rtems_tools_version}
+ %source set rtems-tools https://git.rtems.org/rtems-tools/snapshot/%{rtems_tools_source}.tar.bz2
+ %hash sha512 rtems-tools-%{rtems_tools_version}.tar.bz2 af1cda88144583bd9471056291d0a19e8ace0e45efded01e7d32014919a8e57e8a47a58497b2c9201dff925316a8b9cfd0d0e6000f4755471fdf5468b5daa517
 %endif
 
 #
-# The RTEMS Tools build instructions. We use tools 1.
+# Optionally enable/disable building the RTEMS Tools via the command line.
 #
-%include tools/rtems-tools-1.cfg
+%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
diff --git a/rtems/config/tools/rtems-tools-common-1.cfg b/rtems/config/tools/rtems-tools-common-1.cfg
index 9474ad1..d4bbc3b 100644
--- a/rtems/config/tools/rtems-tools-common-1.cfg
+++ b/rtems/config/tools/rtems-tools-common-1.cfg
@@ -21,13 +21,17 @@ License:   BSD-2-Clause + GPL-2.0
   # target location and 'cd ..' fails.
   build_top=$(pwd)
 
-  %if %{rsb_released}
-    rtems_tools_source="rtems-tools-%{rtems_tools_version}"
+  %if ! %{defined rtems_tools_source}
+    %if %{rsb_released}
+      rtems_tools_source="rtems-tools-%{rtems_tools_version}"
+    %else
+      rtems_tools_source="rtems-tools.git"
+    %endif
   %else
-    rtems_tools_source="rtems-tools.git"
+    rtems_tools_source=%{rtems_tools_source}
   %endif
-  source_dir_rtems_tools=${rtems_tools_source}
 
+  source_dir_rtems_tools=${rtems_tools_source}
   %source setup rtems-tools -q -n ${rtems_tools_source}
   %patch setup rtems-tools -p1
 
-- 
2.12.3