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 tools and kernel source URL when released to use sources.

Browse Source 
Remove `%define without_release_url` so the standard release URL processing
is used. This requires the tools and kernel source is available in the
releases `sources` directory.

Updates #2952.
This commit is contained in:
Chris Johns
2017-04-10 17:30:06 +10:00
parent 8e6ba2c625
commit 44ebcc5177
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,9 +62,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%if ! %{defined rtems_kernel_compression}
%define rtems_kernel_compression xz
%endif
%source set rtems %{rtems_release_url}/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.%{rtems_kernel_compression}
%define rtems_bootstrap 0
%define without_release_url
%else
%if ! %{defined rtems_kernel_version}
%define rtems_kernel_version HEAD

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

@@ -21,26 +21,18 @@
%if %{rtems_tools_build}
#
# If the RSB is released look for a release tarball else use git.
# rtems_git_commit_hash : The commit hash else the branch is tracked.
#
%if %{rsb_released}
%source set rtems-tools %{rtems_release_url}/%{rtems_tools_version}/rtems-tools-%{rtems_tools_version}.tar.xz
%define without_release_url
%else
#
# 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}
%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}
#
# The RTEMS Tools build instructions.