Update 4.10 to build from the RTEMS 4.10 branch.

11 files changed, 79 insertions, 49 deletions

diff --git a/bare/config/bare-config.cfg b/bare/config/bare-config.cfg
index e042e47..40b669d 100644
--- a/bare/config/bare-config.cfg
+++ b/bare/config/bare-config.cfg
@@ -5,7 +5,7 @@
 #
 # The RTEMS http git URL.
 #
-%define rtems_version         4.12
+%define rtems_version         4.10
 %define rtems_http_git        http://git.rtems.org
 %define rtems_git_tools       %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version}
 %define bare_binutils_patches %{rtems_git_tools}/binutils
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
diff --git a/rtems/config/rtems-4.10-base.bset b/rtems/config/rtems-4.10-base.bset
deleted file mode 100644
index 44f81b2..0000000
--- a/rtems/config/rtems-4.10-base.bset
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Base defines for RTEMS 4.10
-#
-
-%define rtems_version 4.10
-
-%include rtems-base.bset
diff --git a/rtems/config/rtems-base.bset b/rtems/config/rtems-base.bset
index 0e61423..04c9679 100644
--- a/rtems/config/rtems-base.bset
+++ b/rtems/config/rtems-base.bset
@@ -3,6 +3,11 @@
 #
 
 #
+# Get the version of RTEMS
+#
+%include rtems-version.bset
+
+#
 # Define the build target.
 #
 %define _target %{rtems_arch}-rtems%{rtems_version}
diff --git a/rtems/config/rtems-version.bset b/rtems/config/rtems-version.bset
new file mode 100644
index 0000000..d052125
--- /dev/null
+++ b/rtems/config/rtems-version.bset
@@ -0,0 +1,6 @@
+#
+# Vversion of RTEMS 4.10
+#
+
+%define rtems_version 4.10
+%define release       1
diff --git a/rtems/config/tools/rtems-gdb-7.3.1-1.cfg b/rtems/config/tools/rtems-gdb-7.3.1-1.cfg
index 0adefa1..cffccc4 100644
--- a/rtems/config/tools/rtems-gdb-7.3.1-1.cfg
+++ b/rtems/config/tools/rtems-gdb-7.3.1-1.cfg
@@ -2,11 +2,16 @@
 # GDB 7.3.
 #
 
+%if %{_build_os} == freebsd
+ %define build_cflags -Wno-return-type
+%endif
+
 %include %{_configdir}/checks.cfg
 %include %{_configdir}/base.cfg
 
 %define gdb_version 7.3.1
 
+%define gdb_src_ext bz2
 %hash md5 gdb-%{gdb_version}.tar.bz2 b89a5fac359c618dda97b88645ceab47
 
 %patch add gdb %{rtems_gdb_patches}/gdb-7.3.1-rtems4.10-20120918.diff
diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg
index 33e8020..e13458d 100644
--- a/rtems/config/tools/rtems-kernel-4-1.cfg
+++ b/rtems/config/tools/rtems-kernel-4-1.cfg
@@ -4,6 +4,13 @@
 # This configuration file configure's, make's and install's RTEMS.
 #
 
+%if %{release}
+ %define release 1
+%endif
+
+#
+# If released use that version number else use the git version.
+#
 %if %{rsb_released}
  %define rtems_kernel_version %{rsb_version}
 %else
diff --git a/rtems/config/tools/rtems-kernel-4.10.2.cfg b/rtems/config/tools/rtems-kernel-4.10.2.cfg
index 29d4b95..c12f0ea 100644
--- a/rtems/config/tools/rtems-kernel-4.10.2.cfg
+++ b/rtems/config/tools/rtems-kernel-4.10.2.cfg
@@ -2,14 +2,8 @@
 # RTEMS 4.10.2
 #
 
-%include %{_configdir}/checks.cfg
-%include %{_configdir}/base.cfg
-
-%define rsb_released
-%define rtems_kernel_version     4.10.2
 %define rtems_kernel_compression bz2
-
-%hash md5 rtems-%{rtems_kernel_version}.tar.bz2 158566d0f1330d4eaba5a60e757d3dd0
+%hash md5 rtems-%{rtems_version}.tar.bz2 158566d0f1330d4eaba5a60e757d3dd0
 
 #
 # The RTEMS build instructions. We use 4.xx Release 1.