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.

37 files changed, 31 insertions, 27 deletions

diff --git a/source-builder/config/autoconf-2.68-1.cfg b/bare/config/devel/autoconf-2.68-1.cfg
index c01f8fc..c01f8fc 100644
--- a/source-builder/config/autoconf-2.68-1.cfg
+++ b/bare/config/devel/autoconf-2.68-1.cfg
diff --git a/source-builder/config/autoconf-2.69-1.cfg b/bare/config/devel/autoconf-2.69-1.cfg
index 3119aee..3119aee 100644
--- a/source-builder/config/autoconf-2.69-1.cfg
+++ b/bare/config/devel/autoconf-2.69-1.cfg
diff --git a/source-builder/config/autoconf-internal-2.68-1.cfg b/bare/config/devel/autoconf-internal-2.68-1.cfg
index 6adf097..6adf097 100644
--- a/source-builder/config/autoconf-internal-2.68-1.cfg
+++ b/bare/config/devel/autoconf-internal-2.68-1.cfg
diff --git a/source-builder/config/automake-1.12-1.cfg b/bare/config/devel/automake-1.12-1.cfg
index ca04bf7..ca04bf7 100644
--- a/source-builder/config/automake-1.12-1.cfg
+++ b/bare/config/devel/automake-1.12-1.cfg
diff --git a/source-builder/config/automake-1.12.2-1.cfg b/bare/config/devel/automake-1.12.2-1.cfg
index 63b24da..63b24da 100644
--- a/source-builder/config/automake-1.12.2-1.cfg
+++ b/bare/config/devel/automake-1.12.2-1.cfg
diff --git a/source-builder/config/automake-internal-1.12-1.cfg b/bare/config/devel/automake-internal-1.12-1.cfg
index 9123a48..9123a48 100644
--- a/source-builder/config/automake-internal-1.12-1.cfg
+++ b/bare/config/devel/automake-internal-1.12-1.cfg
diff --git a/source-builder/config/binutils-2.22-1.cfg b/bare/config/devel/binutils-2.22-1.cfg
index e585483..e585483 100644
--- a/source-builder/config/binutils-2.22-1.cfg
+++ b/bare/config/devel/binutils-2.22-1.cfg
diff --git a/source-builder/config/dtc-1.2.0.cfg b/bare/config/devel/dtc-1.2.0.cfg
index ddc5ed9..ddc5ed9 100644
--- a/source-builder/config/dtc-1.2.0.cfg
+++ b/bare/config/devel/dtc-1.2.0.cfg
diff --git a/source-builder/config/expat-2.1.0-1.cfg b/bare/config/devel/expat-2.1.0-1.cfg
index 7a87aab..7a87aab 100644
--- a/source-builder/config/expat-2.1.0-1.cfg
+++ b/bare/config/devel/expat-2.1.0-1.cfg
diff --git a/source-builder/config/gcc-4.6-newlib-1.20-1.cfg b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
index 0a7cc63..0a7cc63 100644
--- a/source-builder/config/gcc-4.6-newlib-1.20-1.cfg
+++ b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
diff --git a/source-builder/config/gcc-4.7-newlib-1.20-1.cfg b/bare/config/devel/gcc-4.7-newlib-1.20-1.cfg
index 8c00e6f..8c00e6f 100644
--- a/source-builder/config/gcc-4.7-newlib-1.20-1.cfg
+++ b/bare/config/devel/gcc-4.7-newlib-1.20-1.cfg
diff --git a/source-builder/config/libusb-1.0.9-1.cfg b/bare/config/devel/libusb-1.0.9-1.cfg
index 728a626..728a626 100644
--- a/source-builder/config/libusb-1.0.9-1.cfg
+++ b/bare/config/devel/libusb-1.0.9-1.cfg
diff --git a/source-builder/config/m4-1.4.16-1.cfg b/bare/config/devel/m4-1.4.16-1.cfg
index 8753a64..8753a64 100644
--- a/source-builder/config/m4-1.4.16-1.cfg
+++ b/bare/config/devel/m4-1.4.16-1.cfg
diff --git a/source-builder/config/texane-stlink-1.cfg b/bare/config/devel/texane-stlink-1.cfg
index 9a5d075..9a5d075 100644
--- a/source-builder/config/texane-stlink-1.cfg
+++ b/bare/config/devel/texane-stlink-1.cfg
diff --git a/source-builder/config/gnu-tools-4.6.bset b/bare/config/gnu-tools-4.6.bset
index 54d9a56..54d9a56 100644
--- a/source-builder/config/gnu-tools-4.6.bset
+++ b/bare/config/gnu-tools-4.6.bset
diff --git a/rtems/config/4.11/rtems-arm.bset b/rtems/config/4.11/rtems-arm.bset
index 9590595..62e4a1a 100644
--- a/rtems/config/4.11/rtems-arm.bset
+++ b/rtems/config/4.11/rtems-arm.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-autotools.bset b/rtems/config/4.11/rtems-autotools.bset
index c3e9541..af94b6a 100644
--- a/rtems/config/4.11/rtems-autotools.bset
+++ b/rtems/config/4.11/rtems-autotools.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-avr.bset b/rtems/config/4.11/rtems-avr.bset
index b613b57..6b52632 100644
--- a/rtems/config/4.11/rtems-avr.bset
+++ b/rtems/config/4.11/rtems-avr.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-bfin.bset b/rtems/config/4.11/rtems-bfin.bset
index 8fd2e91..a7553bc 100644
--- a/rtems/config/4.11/rtems-bfin.bset
+++ b/rtems/config/4.11/rtems-bfin.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-h8300.bset b/rtems/config/4.11/rtems-h8300.bset
index 04c2298..106d9bb 100644
--- a/rtems/config/4.11/rtems-h8300.bset
+++ b/rtems/config/4.11/rtems-h8300.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-i386.bset b/rtems/config/4.11/rtems-i386.bset
index e53cbf8..e08142d 100644
--- a/rtems/config/4.11/rtems-i386.bset
+++ b/rtems/config/4.11/rtems-i386.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-lm32.bset b/rtems/config/4.11/rtems-lm32.bset
index 8109c6b..9f1941c 100644
--- a/rtems/config/4.11/rtems-lm32.bset
+++ b/rtems/config/4.11/rtems-lm32.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-m32c.bset b/rtems/config/4.11/rtems-m32c.bset
index 886cb5d..02bced5 100644
--- a/rtems/config/4.11/rtems-m32c.bset
+++ b/rtems/config/4.11/rtems-m32c.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-m32r.bset b/rtems/config/4.11/rtems-m32r.bset
index 36b790d..810ffe2 100644
--- a/rtems/config/4.11/rtems-m32r.bset
+++ b/rtems/config/4.11/rtems-m32r.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-m68k.bset b/rtems/config/4.11/rtems-m68k.bset
index 2a3d1d0..03d8be5 100644
--- a/rtems/config/4.11/rtems-m68k.bset
+++ b/rtems/config/4.11/rtems-m68k.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-microblaze.bset b/rtems/config/4.11/rtems-microblaze.bset
index 539e96e..e7643a0 100644
--- a/rtems/config/4.11/rtems-microblaze.bset
+++ b/rtems/config/4.11/rtems-microblaze.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-mips.bset b/rtems/config/4.11/rtems-mips.bset
index 0d957a9..a21e5d1 100644
--- a/rtems/config/4.11/rtems-mips.bset
+++ b/rtems/config/4.11/rtems-mips.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-moxie.bset b/rtems/config/4.11/rtems-moxie.bset
index 048fb76..7bb96c6 100644
--- a/rtems/config/4.11/rtems-moxie.bset
+++ b/rtems/config/4.11/rtems-moxie.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-nios2.bset b/rtems/config/4.11/rtems-nios2.bset
index bd01cb7..969fcdc 100644
--- a/rtems/config/4.11/rtems-nios2.bset
+++ b/rtems/config/4.11/rtems-nios2.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-powerpc.bset b/rtems/config/4.11/rtems-powerpc.bset
index d53b3c4..4e55b99 100644
--- a/rtems/config/4.11/rtems-powerpc.bset
+++ b/rtems/config/4.11/rtems-powerpc.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-sh.bset b/rtems/config/4.11/rtems-sh.bset
index f609599..6dad9a6 100644
--- a/rtems/config/4.11/rtems-sh.bset
+++ b/rtems/config/4.11/rtems-sh.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset
index d60c9a9..3f46a87 100644
--- a/rtems/config/4.11/rtems-sparc.bset
+++ b/rtems/config/4.11/rtems-sparc.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-sparc64.bset b/rtems/config/4.11/rtems-sparc64.bset
index 292253b..afef35a 100644
--- a/rtems/config/4.11/rtems-sparc64.bset
+++ b/rtems/config/4.11/rtems-sparc64.bset
@@ -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
diff --git a/rtems/config/4.11/rtems-v850.bset b/rtems/config/4.11/rtems-v850.bset
index 6c45f8c..9c1f434 100644
--- a/rtems/config/4.11/rtems-v850.bset
+++ b/rtems/config/4.11/rtems-v850.bset
@@ -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
diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc
index 274cc9f..ee9bc01 100644
--- a/source-builder/defaults.mc
+++ b/source-builder/defaults.mc
@@ -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'
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':
diff --git a/source-builder/sb/options.py b/source-builder/sb/options.py
index 72709f5..019f4ee 100644
--- a/source-builder/sb/options.py
+++ b/source-builder/sb/options.py
@@ -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:'