diff options
author | Chris Johns <chrisj@rtems.org> | 2017-04-10 17:30:06 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2017-04-10 17:30:06 +1000 |
commit | 61e26178a75812318a637288818cdf4c4458a055 (patch) | |
tree | 719046bb39dbec9a4289eb0c3f050e81d9d5ae3e | |
parent | 4.11/sparc: The sparc patch is held in the 4.12 in rtems-tools.git. (diff) | |
download | rtems-source-builder-61e26178a75812318a637288818cdf4c4458a055.tar.bz2 |
Fix the tools and kernel source URL when released to use `sources`.
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.
-rw-r--r-- | rtems/config/tools/rtems-kernel-4-1.cfg | 2 | ||||
-rw-r--r-- | rtems/config/tools/rtems-tools-1.cfg | 26 |
2 files changed, 9 insertions, 19 deletions
diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg index 33e8020..8047474 100644 --- a/rtems/config/tools/rtems-kernel-4-1.cfg +++ b/rtems/config/tools/rtems-kernel-4-1.cfg @@ -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 diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg index bde2ce5..15b6ac8 100644 --- a/rtems/config/tools/rtems-tools-1.cfg +++ b/rtems/config/tools/rtems-tools-1.cfg @@ -21,27 +21,19 @@ %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 + %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 - # - # 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} + %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. # |