Fix the release builds of rtems-tools and kernel.

Updates #2952.

2 files changed, 28 insertions, 24 deletions

diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg
index cdde4c0..a57ec61 100644
--- a/rtems/config/tools/rtems-kernel-4-1.cfg
+++ b/rtems/config/tools/rtems-kernel-4-1.cfg
@@ -62,7 +62,8 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   %if ! %{defined rtems_kernel_compression}
    %define rtems_kernel_compression xz
   %endif
-  %define rtems_kernel_version %{rtems_version}
+  %define rtems_kernel_version %{rsb_version}
+  %source set rtems %{rtems_release_url}/rtems-%{rtems_kernel_version}.tar.%{rtems_kernel_compression}
   %define rtems_bootstrap 0
  %else
   #
@@ -70,18 +71,20 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   # no way to change what changes may have happened in the code.
   #
   %define rtems_bootstrap 1
- %endif
 
- %if ! %{defined rtems_kernel_version}
-  %define rtems_kernel_version HEAD
- %endif
- %if %{defined rtems_kernel_git_commit_hash}
-  %define rtems_kernel_git_checkout ?checkout=%{defined rtems_kernel_git_commit_hash}
- %else
-  %define rtems_kernel_git_checkout %{nil}
+  %if ! %{defined rtems_kernel_version}
+   %define rtems_kernel_version HEAD
+  %endif
+  %if %{defined rtems_kernel_git_commit_hash}
+   %define rtems_kernel_git_checkout ?checkout=%{defined rtems_kernel_git_commit_hash}
+  %else
+   %define rtems_kernel_git_checkout %{nil}
+  %endif
+
+  %source set rtems git://git.rtems.org/rtems.git?reset=hard?branch=%{rtems_kernel_version}?pull%{rtems_kernel_git_checkout} #
  %endif
 
- %source set rtems git://git.rtems.org/rtems.git?reset=hard?branch=%{rtems_kernel_version}?pull%{rtems_kernel_git_checkout} #
+ #
  # If C++ defined for the tool set use it to control RTEMS's setting..
  #
  %if %{defined enable_cxx}
diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg
index 0fec850..7e80c32 100644
--- a/rtems/config/tools/rtems-tools-1.cfg
+++ b/rtems/config/tools/rtems-tools-1.cfg
@@ -21,22 +21,23 @@
 
 %if %{rtems_tools_build}
  %if %{rsb_released}
-  %define rtems_tools_version %{rtems_version}
- %endif
-
- #
- # rtems_git_commit_hash : The commit hash else the branch is tracked.
- #
- %if ! %{defined rtems_tools_version}
-  %define rtems_tools_version HEAD
- %endif
- %if %{defined rtems_tools_git_commit_hash}
-  %define rtems_tools_git_checkout ?checkout=%{defined rtems_tools_git_commit_hash}
+  %define rtems_tools_version %{rsb_version}
+  %source set rtems-tools %{rtems_release_url}/%{rtems_tools_version}/rtems-tools-%{rtems_tools_version}.tar.xz
  %else
-  %define rtems_tools_git_checkout %{nil}
- %endif
+  #
+  # rtems_git_commit_hash : The commit hash else the branch is tracked.
+  #
+  %if ! %{defined rtems_tools_version}
+   %define rtems_tools_version HEAD
+  %endif
+  %if %{defined rtems_tools_git_commit_hash}
+   %define rtems_tools_git_checkout ?checkout=%{defined rtems_tools_git_commit_hash}
+  %else
+   %define rtems_tools_git_checkout %{nil}
+  %endif
 
- %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?fetch?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
+  %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?fetch?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
+ %endif
 
  #
  # The RTEMS Tools build instructions.