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

Updates #2952.
This commit is contained in:
Chris Johns 2017-04-11 22:12:13 +10:00
parent 44ebcc5177
commit 4141cca73d
2 changed files with 15 additions and 12 deletions

View File

@ -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}

View File

@ -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.
#