rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the release builds of rtems-tools and kernel.

Browse Source 
Updates #2952.
This commit is contained in:
Chris Johns 2017-04-13 08:42:00 +10:00
parent e85c673ef2
commit 576e284c9d
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtems/config/tools/rtems-kernel-4-1.cfg
View File

@ -62,7 +62,8 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%if ! %{defined rtems_kernel_compression} %if ! %{defined rtems_kernel_compression}
%define rtems_kernel_compression xz %define rtems_kernel_compression xz
%endif %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 %define rtems_bootstrap 0
%else %else
# #
@ -70,7 +71,6 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
# no way to change what changes may have happened in the code. # no way to change what changes may have happened in the code.
# #
%define rtems_bootstrap 1 %define rtems_bootstrap 1
%endif
%if ! %{defined rtems_kernel_version} %if ! %{defined rtems_kernel_version}
%define rtems_kernel_version HEAD %define rtems_kernel_version HEAD
@ -82,6 +82,9 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%endif %endif
%source set rtems git://git.rtems.org/rtems.git?reset=hard?branch=%{rtems_kernel_version}?pull%{rtems_kernel_git_checkout} # %source set rtems git://git.rtems.org/rtems.git?reset=hard?branch=%{rtems_kernel_version}?pull%{rtems_kernel_git_checkout} #
%endif
#
# If C++ defined for the tool set use it to control RTEMS's setting.. # If C++ defined for the tool set use it to control RTEMS's setting..
# #
%if %{defined enable_cxx} %if %{defined enable_cxx}

7
rtems/config/tools/rtems-tools-1.cfg
View File

@ -21,9 +21,9 @@
%if %{rtems_tools_build} %if %{rtems_tools_build}
%if %{rsb_released} %if %{rsb_released}
%define rtems_tools_version %{rtems_version} %define rtems_tools_version %{rsb_version}
%endif %source set rtems-tools %{rtems_release_url}/%{rtems_tools_version}/rtems-tools-%{rtems_tools_version}.tar.xz
%else
# #
# rtems_git_commit_hash : The commit hash else the branch is tracked. # rtems_git_commit_hash : The commit hash else the branch is tracked.
# #
@ -37,6 +37,7 @@
%endif %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. # The RTEMS Tools build instructions.