Changeset b0f9e30 in rtems-source-builder


Ignore:
Timestamp:
Mar 17, 2015, 9:21:34 PM (5 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.9, master
Children:
b6d6a11
Parents:
7f7d388
Message:

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.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg

    r7f7d388 rb0f9e30  
    3636# Newlib is from CVS and this is via a git mirror. No hash on GIT
    3737#
    38 %source set newlib git://sourceware.org/git/newlib.git?fetch?reset=hard?branch=master?checkout=%{newlib_version}
     38%source set newlib git://sourceware.org/git/newlib.git?fetch?reset=hard?merge?branch=master?checkout=%{newlib_version}
    3939
    4040#
  • rtems/config/tools/rtems-tools-1.cfg

    r7f7d388 rb0f9e30  
    3131  %define rtems_tools_git_checkout %{nil}
    3232 %endif
    33  %source set rtems-tools git://git.rtems.org/rtems-tools.git?fetch?reset=hard?branch=master%{rtems_tools_git_checkout}
     33 %source set rtems-tools git://git.rtems.org/rtems-tools.git?fetch?reset=hard?merge?branch=master%{rtems_tools_git_checkout}
    3434
    3535 #
  • source-builder/sb/download.py

    r7f7d388 rb0f9e30  
    424424            if _do_download(opts):
    425425                repo.checkout(_as[1])
    426         elif _as[0] == 'pull':
    427             log.notice('git: pull: %s' % (us[0]))
    428             if _do_download(opts):
    429                 repo.pull()
    430426        elif _as[0] == 'submodule':
    431427            if len(_as) != 2:
     
    438434            if _do_download(opts):
    439435                repo.fetch()
     436        elif _as[0] == 'merge':
     437            log.notice('git: merge: %s' % (us[0]))
     438            if _do_download(opts):
     439                repo.merge()
     440        elif _as[0] == 'pull':
     441            log.notice('git: pull: %s' % (us[0]))
     442            if _do_download(opts):
     443                repo.pull()
    440444        elif _as[0] == 'reset':
    441445            arg = []
  • source-builder/sb/git.py

    r7f7d388 rb0f9e30  
    7878    def fetch(self):
    7979        ec, output = self._run(['fetch'], check = True)
     80
     81    def merge(self):
     82        ec, output = self._run(['merge'], check = True)
    8083
    8184    def pull(self):
Note: See TracChangeset for help on using the changeset viewer.