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

Add merge to the git and download modules to merge after a fetch.

Browse Source 
Update the RTEMS tools and newlib-git to merge after the fetch.
This commit is contained in:
Chris Johns
2015-03-18 08:21:34 +11:00
parent 7f7d388af8
commit b0f9e30fa4
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg
View File

@@ -35,7 +35,7 @@
#
# Newlib is from CVS and this is via a git mirror. No hash on GIT
#
%source set newlib git://sourceware.org/git/newlib.git?fetch?reset=hard?branch=master?checkout=%{newlib_version}
%source set newlib git://sourceware.org/git/newlib.git?fetch?reset=hard?merge?branch=master?checkout=%{newlib_version}
#
# The gcc/newlib build instructions. We use 4.9 Release 1.

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

@@ -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.