summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2016-03-18 10:50:59 +1100
committerChris Johns <chrisj@rtems.org>2016-03-18 10:50:59 +1100
commit07eef425f18d11205ed4a76b717250f98fed6bac (patch)
tree708729ad2c497eecc5f12bd6c4504f3410d9db94
parentrtems/kernel: Move the --with-rtems logic in the common file. (diff)
downloadrtems-source-builder-07eef425f18d11205ed4a76b717250f98fed6bac.tar.bz2
4.12/rtems-kernel: Add default support to build a kernel if asked too.
-rw-r--r--rtems/config/4.12/rtems-default.bset1
-rw-r--r--rtems/config/tools/rtems-kernel-4.11.cfg56
-rw-r--r--rtems/config/tools/rtems-kernel-4.12.cfg8
3 files changed, 9 insertions, 56 deletions
diff --git a/rtems/config/4.12/rtems-default.bset b/rtems/config/4.12/rtems-default.bset
index 0083e6a..48092c4 100644
--- a/rtems/config/4.12/rtems-default.bset
+++ b/rtems/config/4.12/rtems-default.bset
@@ -6,3 +6,4 @@ tools/rtems-binutils-2.26-1
tools/rtems-gcc-6-20160228-newlib-2.3.0.20160226-1
tools/rtems-gdb-7.11-1
tools/rtems-tools-4.12-1
+tools/rtems-kernel-4.12
diff --git a/rtems/config/tools/rtems-kernel-4.11.cfg b/rtems/config/tools/rtems-kernel-4.11.cfg
deleted file mode 100644
index e448dc5..0000000
--- a/rtems/config/tools/rtems-kernel-4.11.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS 4.11
-#
-
-#
-# Build if the RSB is released.
-#
-%if %{rsb_released}
- %define rtems_kernel_build 1
-%endif
-
-#
-# Optionally enable/disable building the RTEMS kernel via the command line.
-#
-%if %{defined with_rtems}
- %define rtems_kernel_build 1
-%else
- %define rtems_kernel_build 0
-%endif
-%if %{defined without_rtems}
- %define rtems_kernel_build 0
-%endif
-
-%if %{rtems_kernel_build}
- %include %{_configdir}/checks.cfg
- %include %{_configdir}/base.cfg
- %include %{_configdir}/versions.cfg
-
- %if %{rsb_released}
- %define rtems_kernel_version %{rsb_version}
- %else
- %define rtems_kernel_version %{rtems_version}
- %endif
-
- #
- # A magic internal path that would break if changes in the defaults.mc
- # macro file are made.
- #
- %define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
-
- #
- # Check the version of autoconf. Check autoreconf as it is used.
- #
- %if %{__autoreconf_ver} <= 2.68
- %if %{__autoreconf_bindir_ver} <= 2.68
- %if %{__autoreconf_path_ver} <= 2.68
- %error Autoconf (autoreconf) version 2.69 or higher is needed.
- %endif
- %endif
- %endif
-
- #
- # The RTEMS build instructions. We use 4.xx Release 1.
- #
- %include tools/rtems-kernel-4-1.cfg
-%endif
diff --git a/rtems/config/tools/rtems-kernel-4.12.cfg b/rtems/config/tools/rtems-kernel-4.12.cfg
new file mode 100644
index 0000000..a841d63
--- /dev/null
+++ b/rtems/config/tools/rtems-kernel-4.12.cfg
@@ -0,0 +1,8 @@
+#
+# RTEMS 4.12
+#
+
+ #
+ # The RTEMS build instructions. We use 4.xx Release 1.
+ #
+%include tools/rtems-kernel-4-1.cfg