[rtems-source-builder commit] Fix rtems-tools and rtems-kernel builds when released and with a release URL.

[Chris Johns]

Module:    rtems-source-builder
Branch:    4.11
Commit:    949731c40bfd983adf13756b1d30ad12691e6324
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=949731c40bfd983adf13756b1d30ad12691e6324

Author:    Chris Johns <chrisj at rtems.org>
Date:      Tue Apr 11 22:12:13 2017 +1000

Fix rtems-tools and rtems-kernel builds when released and with a release URL.

Updates #2952.

---

 rtems/config/tools/rtems-kernel-4-1.cfg | 23 +++++++++++------------
 rtems/config/tools/rtems-tools-1.cfg    |  4 ++++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg
index 8047474..cdde4c0 100644
--- a/rtems/config/tools/rtems-kernel-4-1.cfg
+++ b/rtems/config/tools/rtems-kernel-4-1.cfg
@@ -62,19 +62,9 @@ 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_bootstrap 0
  %else
-  %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}
-
   #
   # The code in git needs to be bootstrapped. Do each build because we have
   # no way to change what changes may have happened in the code.
@@ -82,7 +72,16 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   %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}
+ %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 15b6ac8..0fec850 100644
--- a/rtems/config/tools/rtems-tools-1.cfg
+++ b/rtems/config/tools/rtems-tools-1.cfg
@@ -20,6 +20,10 @@
 %endif
 
 %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.
  #