[rtems-source-builder commit] 4.11/rtems-kernel: Use the updated common support for conditional building.

Chris Johns chrisj at rtems.org
Fri Mar 18 02:37:37 UTC 2016


Module:    rtems-source-builder
Branch:    4.11
Commit:    a8d64ad94dda9bb98fb8d2de612555be12baa6bd
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=a8d64ad94dda9bb98fb8d2de612555be12baa6bd

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Mar 18 12:58:44 2016 +1100

4.11/rtems-kernel: Use the updated common support for conditional building.

Updates #2526.

---

 rtems/config/tools/rtems-kernel-4.11.cfg | 52 ++------------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

diff --git a/rtems/config/tools/rtems-kernel-4.11.cfg b/rtems/config/tools/rtems-kernel-4.11.cfg
index e448dc5..b7a44ba 100644
--- a/rtems/config/tools/rtems-kernel-4.11.cfg
+++ b/rtems/config/tools/rtems-kernel-4.11.cfg
@@ -3,54 +3,6 @@
 #
 
 #
-# Build if the RSB is released.
+# The RTEMS build instructions. We use 4.xx Release 1.
 #
-%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
+%include tools/rtems-kernel-4-1.cfg




More information about the vc mailing list