diff options
author | Chris Johns <chrisj@rtems.org> | 2013-05-14 11:08:02 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2013-05-14 11:08:02 +1000 |
commit | 1a56a07605ba9720ec91c9bbf17566ffc7887bfe (patch) | |
tree | 8f55eba7e5a549c0eb39301688c98c544bca425d /source-builder/sb/macros.py | |
parent | Newlib CVS: 13-May-2013. Pick up the atexit changes. (diff) | |
download | rtems-source-builder-1a56a07605ba9720ec91c9bbf17566ffc7887bfe.tar.bz2 |
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.
Diffstat (limited to 'source-builder/sb/macros.py')
-rw-r--r-- | source-builder/sb/macros.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source-builder/sb/macros.py b/source-builder/sb/macros.py index f77af97..194d4ed 100644 --- a/source-builder/sb/macros.py +++ b/source-builder/sb/macros.py @@ -62,6 +62,7 @@ class macros: self.macros['global'] = {} self.macros['global']['_cwd'] = ('dir', 'required', path.abspath(os.getcwd())) self.macros['global']['_sbdir'] = ('dir', 'required', path.abspath(sbdir)) + self.macros['global']['_sbtop'] = ('dir', 'required', path.abspath(path.dirname(sbdir))) else: self.macros = {} for m in original.macros: @@ -145,7 +146,7 @@ class macros: raise TypeError('bad value tuple value field: %s' % (type(value[2]))) if value[0] not in ['none', 'triplet', 'dir', 'file', 'exe']: raise TypeError('bad value tuple (type field): %s' % (value[0])) - if value[1] not in ['none', 'optional', 'required', + if value[1] not in ['none', 'optional', 'required', 'override', 'undefine', 'convert']: raise TypeError('bad value tuple (attrib field): %s' % (value[1])) if value[1] == 'convert': |