Changeset f077b2b in rtems-source-builder


Ignore:
Timestamp:
Apr 22, 2013, 12:28:27 PM (6 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.9, master
Children:
1869040
Parents:
5f44fcd
Message:

Fixes for CVS to work. Add RTEMS build for sparc/sis.

Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • rtems/config/4.11/rtems-sparc.bset

    r5f44fcd rf077b2b  
    66
    77%define rtems_arch sparc
     8
     9#
     10# The RTEMS 4.11 BSP to build and test
     11#
     12%define rtems_bsps      sis
     13%define rtems_test_bsps sis
    814
    915#
     
    1925tools/rtems-gcc-4.7.3-newlib-2.0.0-1
    2026tools/rtems-gdb-7.5.1-1
     27tools/rtems-kernel-4.11.cfg
  • rtems/config/tools/rtems-kernel-4-1.cfg

    r5f44fcd rf077b2b  
    4747#
    4848%prep
     49  source_dir_0="rtems-%{rtems_kernel_version}"
    4950  %setup -q -c -n %{name}-%{version}
    50   cd rtems-%{rtems_kernel_version}
     51  cd ${source_dir_0}
    5152  %{?patch0:%patch0 %{?patch0_opts:%{patch0_opts}}%{!?patch0_opts:-p1}}
    5253  %{?patch1:%patch1 %{?patch1_opts:%{patch1_opts}}%{!?patch1_opts:-p1}}
     
    5960  %{?patch8:%patch8 %{?patch8_opts:%{patch8_opts}}%{!?patch8_opts:-p1}}
    6061  %{?patch9:%patch9 %{?patch9_opts:%{patch9_opts}}%{!?patch9_opts:-p1}}
     62%if %{rtems_bootstrap}
     63  ./bootstrap -c
     64  ./bootstrap -p
     65  ./bootstrap
     66%endif
    6167  cd ..
    6268
    6369%build
    64   export PATH="%{_bindir}:${PATH}"
    65   mkdir -p build
    66   cd build
    67   %{?host_force_32bit:HOST_FORCE_32BIT="-m32"}
    68 %if "%{_build}" != "%{_host}"
    69   CFLAGS_FOR_BUILD="-g -O2 -Wall ${HOST_FORCE_32BIT}" \
    70 %endif
    71   CFLAGS="$SB_OPT_FLAGS" \
    72   ../rtems-%{rtems_kernel_version}/configure \
     70  # Build directory support.
     71  if test "%{_build}" != "%{_host}" ; then
     72    build_dir="build-cxc"
     73  else
     74    build_dir="build"
     75  fi
     76  mkdir -p ${build_dir}
     77  cd ${build_dir}
     78
     79  ../${source_dir_0}/configure \
    7380    --build=%{_build} --host=%{_host} \
    7481    --target=%{_target} \
     
    7784    %{?rtems_cxx:--enable-cxx}%{!?rtems_cxx:--disable-cxx} \
    7885    %{rtems_tests_opt} \
     86    %{?rtems_bsps:--enable-rtemsbsp=%{rtems_bsps}} \
    7987    --target=%{_target} \
    8088    --prefix=%{_prefix} --bindir=%{_bindir} \
     
    8795
    8896%install
    89   export PATH="%{_bindir}:${PATH}"
    90   rm -rf $SB_BUILD_ROOT
     97  %{__rmdir} $SB_BUILD_ROOT
    9198
    92   cd build
     99  cd ${build_dir}
    93100  %{__make} DESTDIR=$SB_BUILD_ROOT install
    94101
    95102  cd ..
     103
     104%testing
  • source-builder/sb/build.py

    r5f44fcd rf077b2b  
    132132        download.get_file(source['url'], source['local'], self.opts, self.config)
    133133        if 'symlink' in source:
    134             source['script'] = '%%{__ln_s} %s ${source_dir_%d}' % (source['local'], source_tag)
     134            source['script'] = '%%{__ln_s} %s ${source_dir_%d}' % (source['symlink'], source_tag)
    135135        elif 'compressed' in source:
    136136            source['script'] = source['compressed'] + ' ' + \
  • source-builder/sb/cvs.py

    r5f44fcd rf077b2b  
    3333    """An object to manage a cvs repo."""
    3434
     35    def __init__(self, _path, opts, macros = None, prefix = None):
     36        self.path = _path
     37        self.opts = opts
     38        self.prefix = prefix
     39        if macros is None:
     40            self.macros = opts.defaults
     41        else:
     42            self.macros = macros
     43        self.cvs = self.macros.expand('%{__cvs}')
     44
    3545    def _cvs_exit_code(self, cmd, ec, output):
    3646        if ec:
     
    5464        e = execute.capture_execution()
    5565        if cwd is None:
    56             if not path.exists(self.path):
    57                 raise error.general('cvs path needs to exist: %s' % (self.path))
    58             cwd = self.path
     66            _path = path.join(self.path, self.prefix)
     67            if not path.exists(_path):
     68                raise error.general('cvs path needs to exist: %s' % (_path))
     69            cwd = _path
    5970        cmd = [self.cvs, '-q'] + args
    6071        log.output('cmd: (%s) %s' % (str(cwd), ' '.join(cmd)))
     
    6475            self._cvs_exit_code(cmd, exit_code, output)
    6576        return exit_code, output
    66 
    67     def __init__(self, _path, opts, macros = None, prefix = None):
    68         self.path = _path
    69         self.opts = opts
    70         self.prefix = prefix
    71         if macros is None:
    72             self.macros = opts.defaults
    73         else:
    74             self.macros = macros
    75         self.cvs = self.macros.expand('%{__cvs}')
    7677
    7778    def cvs_version(self):
     
    99100
    100101    def update(self):
    101         ec, output = self._run(['up'])
     102        ec, output = self._run(['up'], check = True)
    102103
    103104    def reset(self):
  • source-builder/sb/download.py

    r5f44fcd rf077b2b  
    7878        raise error.general('invalid cvs path: %s' % (source['url']))
    7979    source['local'] = path.join(source['local_prefix'], 'cvs', source['file'])
     80    for a in us[1:]:
     81        _as = a.split('=')
     82        if  _as[0] == 'src-prefix':
     83            if len(_as) != 2:
     84                raise error.general('invalid cvs src-prefix: %s' % (a))
     85            source['src_prefix'] = _as[1]
    8086    if 'src_prefix' in source:
    81         source['symlink'] = path.join(source['local'])
     87        source['symlink'] = path.join(source['local'], source['src_prefix'])
    8288    else:
    8389        source['symlink'] = source['local']
     
    226232    repo = cvs.repo(local, opts, config.macros, src_prefix)
    227233    if not repo.valid():
    228         log.notice('cvs: checkout: %s -> %s' % (us[0], rlp))
    229234        if not path.isdir(local):
    230235            log.notice('Creating source directory: %s' % \
    231236                           (os.path.relpath(path.host(local))))
    232             log.output('making dir: %s' % (path.host(path.dirname(local))))
    233237            if not opts.dry_run():
    234238                path.mkdir(local)
    235             repo.checkout(':%s' % (us[0][6:]), module, tag, date)
     239            log.notice('cvs: checkout: %s -> %s' % (us[0], rlp))
     240            if not opts.dry_run():
     241                repo.checkout(':%s' % (us[0][6:]), module, tag, date)
    236242    for a in us[1:]:
    237243        _as = a.split('=')
Note: See TracChangeset for help on using the changeset viewer.