diff options
author | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2015-03-18 08:21:34 +1100 |
commit | b0f9e30fa46a8025b76bf86321ebe585de8972f4 (patch) | |
tree | 6d41e695fa3fde9c57df29696f2e5874a064116a /rtems/config/tools/rtems-tools-1.cfg | |
parent | Add gdb-7.8.2 hash. (diff) | |
download | rtems-source-builder-b0f9e30fa46a8025b76bf86321ebe585de8972f4.tar.bz2 |
Add merge to the git and download modules to merge after a fetch.
Update the RTEMS tools and newlib-git to merge after the fetch.
Diffstat (limited to 'rtems/config/tools/rtems-tools-1.cfg')
-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 f40a9e1..aebf3c5 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?branch=master%{rtems_tools_git_checkout} + %source set rtems-tools git://git.rtems.org/rtems-tools.git?fetch?reset=hard?merge?branch=master%{rtems_tools_git_checkout} # # The RTEMS Tools build instructions. We use GIT Release 1. |