diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-03-20 13:58:48 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-03-20 13:58:48 +1100 |
| commit | 1039ac9dbb681a99d5dc1bfa214053c0917418e1 (patch) | |
| tree | ce40b99cebb3dc2e279dc07b6e8f4c2d3dbe5c9d | |
| parent | sb: Do not accept an extra separate option for --with/--without. (diff) | |
| download | rtems-source-builder-1039ac9dbb681a99d5dc1bfa214053c0917418e1.tar.bz2 | |
rtems/tools: Change the order of the git URL to not do a merge.
The merge was failing for some users. Change to reset, branch master
and then pull.
| -rw-r--r-- | rtems/config/tools/rtems-tools-1.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg index aebf3c5..f770d29 100644 --- a/rtems/config/tools/rtems-tools-1.cfg +++ b/rtems/config/tools/rtems-tools-1.cfg @@ -30,7 +30,7 @@ %define rtems_tools_version HEAD %define rtems_tools_git_checkout %{nil} %endif - %source set rtems-tools git://git.rtems.org/rtems-tools.git?fetch?reset=hard?merge?branch=master%{rtems_tools_git_checkout} + %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. |