4 files changed, 54 insertions, 34 deletions
diff --git a/rtems/config/4.10/rtems-arm.bset b/rtems/config/4.10/rtems-arm.bset
index f1e515a..24a17f4 100644
--- a/rtems/config/4.10/rtems-arm.bset
+++ b/rtems/config/4.10/rtems-arm.bset
@@ -7,30 +7,15 @@
 %define rtems_arch arm
 
 #
-# The RTEMS 4.10 base defines.
+# The RTEMS base defines.
 #
-%include rtems-4.10-base.bset
-
-#
-# The RTEMS 4.10 BSP to build and test
-#
-# Do not build: lm3s3749
-# For automated testing, edb7312 should be configured with:
-#    - ON_SKYEYE=1
-# The GDB based simulators could be used as defaults for testing though.
-# Skyeye includes coverage.
-#
-%define rtems_bsps      all
-%define rtems_test_bsps none
-
-#
-# Disable the tests because the samples do not build.
-#
-%define rtems_tests disable
+%include rtems-base.bset
 
 #
 # Tools configuration.
 #
+4.10/rtems-autotools
+
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.20.1-1
 tools/rtems-gcc-4.4.7-newlib-1.18.0-1
diff --git a/rtems/config/4.10/rtems-autotools-base.bset b/rtems/config/4.10/rtems-autotools-base.bset
new file mode 100644
index 0000000..fd7e95a
--- /dev/null
+++ b/rtems/config/4.10/rtems-autotools-base.bset
@@ -0,0 +1,23 @@
+#
+# Tools Set for RTEMS 4.10 Internal Autotools Stable
+#
+
+%define release 1
+
+%define rtems_arch none
+
+#
+# The RTEMS base defines.
+#
+%include rtems-base.bset
+
+#
+# The autotools package.
+#
+package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
+
+#
+# Tools configuration.
+#
+tools/rtems-autoconf-2.69-1
+tools/rtems-automake-1.12.6-1
diff --git a/rtems/config/4.10/rtems-autotools-internal.bset b/rtems/config/4.10/rtems-autotools-internal.bset
new file mode 100644
index 0000000..92a7f1d
--- /dev/null
+++ b/rtems/config/4.10/rtems-autotools-internal.bset
@@ -0,0 +1,13 @@
+#
+# Tools Set for RTEMS 4.10 Internal Autotools Stable
+#
+# Do not use via the command line.
+#
+
+%define _internal_autotools yes
+%define _disable_collecting yes
+%define _disable_packaging  yes
+%define _disable_reporting  yes
+%define _disable_installing yes
+
+%include 4.10/rtems-autotools-base.bset
diff --git a/rtems/config/4.10/rtems-autotools.bset b/rtems/config/4.10/rtems-autotools.bset
index 004bb31..f7f1929 100644
--- a/rtems/config/4.10/rtems-autotools.bset
+++ b/rtems/config/4.10/rtems-autotools.bset
@@ -1,23 +1,22 @@
 #
-# Tools Set for RTEMS 4.9 Autotools Stable
+# Tools Set for RTEMS 4.10 Autotools Stable
 #
-
-%define release 1
-
-%define rtems_arch none
-
+# Autoconf and automake are not relocatable and cannot be cross-compiled.
+# RTEMS uses autoconf and automake and building RTEMS in the RSB requires
+# bootstrapping and this requires a current autoconf and automake. The RSB
+# provides to support by:
 #
-# The RTEMS 4.9 base defines.
+#  1. Building and installing autoconf and automake with a prefix to a
+#     temporary internal path.
+#  2. Using the temporary internal build, build and install another copy
+#     using the final prefix location.
 #
-%include rtems-4.9-base.bset
 
 #
-# The autotoolspackage.
+# A magic internal path that would break if changes in the defaults.mc
+# macro file are made.
 #
-package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
+%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
 
-#
-# Tools configuration.
-#
-devel/autoconf-2.69-1
-devel/automake-1.12.2-1
+4.10/rtems-autotools-internal
+4.10/rtems-autotools-base