diff options
Diffstat (limited to 'rtems/config/tools/rtems-tools-1.cfg')
| -rw-r--r-- | rtems/config/tools/rtems-tools-1.cfg | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg index f770d29..652a463 100644 --- a/rtems/config/tools/rtems-tools-1.cfg +++ b/rtems/config/tools/rtems-tools-1.cfg @@ -21,19 +21,28 @@ %if %{rtems_tools_build} # - # Pull the latest changes from git each build. Override if this is not what you - # want. + # If the RSB is released look for a release tarball else use git. # - %if %{defined rtems_tools_version} - %define rtems_tools_git_checkout ?checkout=%{rtems_tools_version} + %if %{rsb_released} + %source set rtems-tools %{rtems_release_url}/%{rtems_tools_version}/rtems-tools-%{rtems_tools_version}.tar.xz %else - %define rtems_tools_version HEAD - %define rtems_tools_git_checkout %{nil} + # + # 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?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout} %endif - %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?branch=master?pull%{rtems_tools_git_checkout} # # The RTEMS Tools build instructions. We use GIT Release 1. # - %include tools/rtems-tools-git-1.cfg + %include tools/rtems-tools-common-1.cfg %endif |