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.
This commit is contained in:
Chris Johns 2013-05-14 11:08:02 +10:00
parent df9c0816e2
commit 1a56a07605
37 changed files with 31 additions and 27 deletions

View File

@ -31,7 +31,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -19,5 +19,5 @@ package: rtems-%{rtems_version}-autotools-%{release}
#
# Tools configuration.
#
autoconf-2.69-1
automake-1.12.2-1
devel/autoconf-2.69-1
devel/automake-1.12.2-1

View File

@ -38,7 +38,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -24,7 +24,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -25,7 +25,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.5.3-newlib-2.0.0-1
tools/rtems-gdb-7.6-1

View File

@ -34,7 +34,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -21,7 +21,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -25,7 +25,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -26,8 +26,8 @@
#
# Tools configuration.
#
expat-2.1.0-1
dtc-1.2.0
devel/expat-2.1.0-1
devel/dtc-1.2.0
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -22,7 +22,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-nios2-binutils-2.20-1
tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1
tools/rtems-nios2-gdb-7.0-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -20,7 +20,7 @@
#
# Tools configuration.
#
expat-2.1.0-1
devel/expat-2.1.0-1
tools/rtems-binutils-2.23.2-1
tools/rtems-gcc-4.8.0-newlib-cvs-1
tools/rtems-gdb-7.6-1

View File

@ -47,7 +47,7 @@ buildname: none, none, '%{name}'
# GNU triples needed to build packages
_host: triplet, required, ''
_build: triplet, required, '%{_host}'
_build: triplet, required, ''
_target: none, optional, ''
# The user
@ -57,7 +57,7 @@ _uid: none, convert, '%(%{__id_u} -n)'
_host_platform: none, none, '%{_host_cpu}-%{_host_vendor}-%{_host_os}%{?_gnu}'
_arch: none, none, '%{_host_arch}'
_topdir: dir, required, '%{_cwd}'
_configdir: dir, optional, '%{_topdir}/config:%{_sbdir}/config'
_configdir: dir, optional, '%{_topdir}/config:%{_sbdir}/config:%{_sbtop}/bare/config'
_tardir: dir, optional, '%{_topdir}/tar'
_sourcedir: dir, optional, '%{_topdir}/sources'
_patchdir: dir, optional, '%{_topdir}/patches:%{_sbdir}/patches'

View File

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

View File

@ -258,7 +258,10 @@ class command_line:
log.quiet = True
# Must have a host
if self.defaults['_host'] == self.defaults['nil']:
raise error.general('host not set')
raise error.general('--host not set')
# Must have a host
if self.defaults['_build'] == self.defaults['nil']:
raise error.general('--build not set')
# Manage the regression option
if self.opts['regression'] != '0':
self.opts['no-install'] = '1'
@ -508,7 +511,7 @@ def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc'):
import linux
overrides = linux.load()
except:
raise error.general('failed to load %s host support' % (uname))
raise error.general('failed to load %s host support' % (uname[0]))
else:
raise error.general('unsupported host type; please add')
if overrides is None:
@ -524,7 +527,7 @@ def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc'):
def run(args):
try:
_opts = load(args = args)
_opts = load(args = args, defaults = 'defaults.mc')
print 'Options:'
print _opts
print 'Defaults:'