diff options
author | Chris Johns <chrisj@rtems.org> | 2016-03-14 18:20:21 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-03-14 18:20:21 +1100 |
commit | a15c396dd382bc96fe820ca8bb00bac0c6c3d180 (patch) | |
tree | e29c8a8f001e739b13607dc126bc1c69e97cff33 | |
parent | sb: Fix the --without-error-report parsing of the label. (diff) | |
download | rtems-source-builder-a15c396dd382bc96fe820ca8bb00bac0c6c3d180.tar.bz2 |
rtems-kernel: Fix the --with-rtems/--without-rtems support when released.
Also add:
--with-rtemsbsp="bsp,bsp,bsp"
--with-rtems-smp
--with-rtems-tests
--with-rtems-tests=sample
--with-rtems-tests=all
Closes #2526.
-rw-r--r-- | rtems/config/tools/rtems-kernel-4-1.cfg | 24 | ||||
-rw-r--r-- | rtems/config/tools/rtems-kernel-4.11.cfg | 17 |
2 files changed, 26 insertions, 15 deletions
diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg index e5d115c..c7bb643 100644 --- a/rtems/config/tools/rtems-kernel-4-1.cfg +++ b/rtems/config/tools/rtems-kernel-4-1.cfg @@ -72,12 +72,21 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) %endif # -# It the rtems_bsps is all undefine it +# Check the various --with/--without options we support. # -%if %{defined rtems_bsps} - %if %{rtems_bsps} == all - %undefine rtems_bsps - %endif +# --with-rtemsbsp : Supported, list of BSPs +# --without-rtemsbsp: Not supported +# --with-tests : Supported, samples/yes/no +# --without-tests : Not supported +# --with-smp : Supported +# --without-smp : Not care +# +# +%if %{defined without_rtemsbsp} + %error Option --without-rtemsbsp is not supported. +%endif +%if %{defined without_rtems_tests} + %define with_rtems_tests no %endif # @@ -114,8 +123,9 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) %{?rtems_posix:--enable-posix}%{!?rtems_posix:--disable-posix} \ %{?rtems_networking:--enable-networking}%{!?rtems_networking:--disable-networking} \ %{?rtems_cxx:--enable-cxx}%{!?rtems_cxx:--disable-cxx} \ - %{rtems_tests_opt} \ - %{?rtems_bsps:--enable-rtemsbsp=%{rtems_bsps}} \ + %{?with_rtems_tests:--enable-tests=%{with_rtems_tests}} \ + %{?with_rtemsbsp:--enable-rtemsbsp="%{with_rtemsbsp}"} \ + %{?with_rtems_smp:--enable-smp} \ --prefix=%{_prefix} --bindir=%{_bindir} \ --exec-prefix=%{_exec_prefix} \ --includedir=%{_includedir} --libdir=%{_libdir} \ diff --git a/rtems/config/tools/rtems-kernel-4.11.cfg b/rtems/config/tools/rtems-kernel-4.11.cfg index 1a06aef..e448dc5 100644 --- a/rtems/config/tools/rtems-kernel-4.11.cfg +++ b/rtems/config/tools/rtems-kernel-4.11.cfg @@ -3,6 +3,13 @@ # # +# 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} @@ -10,14 +17,8 @@ %else %define rtems_kernel_build 0 %endif - -# -# Build if the RSB is released. -# -%if ! %{rtems_kernel_build} - %if %{rsb_released} - %define rtems_kernel_build 1 - %endif +%if %{defined without_rtems} + %define rtems_kernel_build 0 %endif %if %{rtems_kernel_build} |