Changeset 1a56a07 in rtems-source-builder


Ignore:
Timestamp:
05/14/13 01:08:02 (9 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.9, 5, master
Children:
8a1e7a0
Parents:
df9c081
Message:

Add bare/config and move the source-builder/config to it.

Rework the RTEMS build set files to point to the new location.

Move the files into devel, this follows the ports naming in
FreeBSD.

Update the macros, defaults, and options to support this.

Files:
22 edited
15 moved

Legend:

Unmodified
Added
Removed

  • rtems/config/4.11/rtems-arm.bset

    rdf9c081 r1a56a07  
    3232# Tools configuration.
    3333#
    34 expat-2.1.0-1
     34devel/expat-2.1.0-1
    3535tools/rtems-binutils-2.23.2-1
    3636tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-autotools.bset

    rdf9c081 r1a56a07  
    2020# Tools configuration.
    2121#
    22 autoconf-2.69-1
    23 automake-1.12.2-1
     22devel/autoconf-2.69-1
     23devel/automake-1.12.2-1

  • rtems/config/4.11/rtems-avr.bset

    rdf9c081 r1a56a07  
    3939# Tools configuration.
    4040#
    41 expat-2.1.0-1
     41devel/expat-2.1.0-1
    4242tools/rtems-binutils-2.23.2-1
    4343tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-bfin.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-h8300.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-i386.bset

    rdf9c081 r1a56a07  
    2525# Tools configuration.
    2626#
    27 expat-2.1.0-1
     27devel/expat-2.1.0-1
    2828tools/rtems-binutils-2.23.2-1
    2929tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-lm32.bset

    rdf9c081 r1a56a07  
    2626# Tools configuration.
    2727#
    28 expat-2.1.0-1
     28devel/expat-2.1.0-1
    2929tools/rtems-binutils-2.23.2-1
    3030tools/rtems-gcc-4.5.3-newlib-2.0.0-1

  • rtems/config/4.11/rtems-m32c.bset

    rdf9c081 r1a56a07  
    3535# Tools configuration.
    3636#
    37 expat-2.1.0-1
     37devel/expat-2.1.0-1
    3838tools/rtems-binutils-2.23.2-1
    3939tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-m32r.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-m68k.bset

    rdf9c081 r1a56a07  
    2222# Tools configuration.
    2323#
    24 expat-2.1.0-1
     24devel/expat-2.1.0-1
    2525tools/rtems-binutils-2.23.2-1
    2626tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-microblaze.bset

    rdf9c081 r1a56a07  
    2626# Tools configuration.
    2727#
    28 expat-2.1.0-1
     28devel/expat-2.1.0-1
    2929tools/rtems-binutils-2.23.2-1
    3030tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-mips.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-moxie.bset

    rdf9c081 r1a56a07  
    2727# Tools configuration.
    2828#
    29 expat-2.1.0-1
    30 dtc-1.2.0
     29devel/expat-2.1.0-1
     30devel/dtc-1.2.0
    3131tools/rtems-binutils-2.23.2-1
    3232tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-nios2.bset

    rdf9c081 r1a56a07  
    2323# Tools configuration.
    2424#
    25 expat-2.1.0-1
     25devel/expat-2.1.0-1
    2626tools/rtems-nios2-binutils-2.20-1
    2727tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1

  • rtems/config/4.11/rtems-powerpc.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-sh.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-sparc.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-sparc64.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • rtems/config/4.11/rtems-v850.bset

    rdf9c081 r1a56a07  
    2121# Tools configuration.
    2222#
    23 expat-2.1.0-1
     23devel/expat-2.1.0-1
    2424tools/rtems-binutils-2.23.2-1
    2525tools/rtems-gcc-4.8.0-newlib-cvs-1

  • source-builder/defaults.mc

    rdf9c081 r1a56a07  
    4848# GNU triples needed to build packages
    4949_host:               triplet, required, ''
    50 _build:              triplet, required, '%{_host}'
     50_build:              triplet, required, ''
    5151_target:             none,    optional, ''
    5252
    … …  
    5858_arch:               none,    none,     '%{_host_arch}'
    5959_topdir:             dir,     required, '%{_cwd}'
    60 _configdir:          dir,     optional, '%{_topdir}/config:%{_sbdir}/config'
     60_configdir:          dir,     optional, '%{_topdir}/config:%{_sbdir}/config:%{_sbtop}/bare/config'
    6161_tardir:             dir,     optional, '%{_topdir}/tar'
    6262_sourcedir:          dir,     optional, '%{_topdir}/sources'

  • source-builder/sb/macros.py

    rdf9c081 r1a56a07  
    6363            self.macros['global']['_cwd'] = ('dir', 'required', path.abspath(os.getcwd()))
    6464            self.macros['global']['_sbdir'] = ('dir', 'required', path.abspath(sbdir))
     65            self.macros['global']['_sbtop'] = ('dir', 'required', path.abspath(path.dirname(sbdir)))
    6566        else:
    6667            self.macros = {}
    … …  
    146147        if value[0] not in ['none', 'triplet', 'dir', 'file', 'exe']:
    147148            raise TypeError('bad value tuple (type field): %s' % (value[0]))
    148         if value[1] not in ['none', 'optional', 'required', 
     149        if value[1] not in ['none', 'optional', 'required',
    149150                            'override', 'undefine', 'convert']:
    150151            raise TypeError('bad value tuple (attrib field): %s' % (value[1]))

  • source-builder/sb/options.py

    rdf9c081 r1a56a07  
    259259        # Must have a host
    260260        if self.defaults['_host'] == self.defaults['nil']:
    261             raise error.general('host not set')
     261            raise error.general('--host not set')
     262        # Must have a host
     263        if self.defaults['_build'] == self.defaults['nil']:
     264            raise error.general('--build not set')
    262265        # Manage the regression option
    263266        if self.opts['regression'] != '0':
    … …  
    509512                overrides = linux.load()
    510513        except:
    511             raise error.general('failed to load %s host support' % (uname))
     514            raise error.general('failed to load %s host support' % (uname[0]))
    512515    else:
    513516        raise error.general('unsupported host type; please add')
    … …  
    525528def run(args):
    526529    try:
    527         _opts = load(args = args)
     530        _opts = load(args = args, defaults = 'defaults.mc')
    528531        print 'Options:'
    529532        print _opts
Note: See TracChangeset for help on using the changeset viewer.