diff options
author | Chris Johns <chrisj@rtems.org> | 2016-03-17 16:39:57 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-03-17 16:50:05 +1100 |
commit | 38ed59a301c5f3e03ce83133dadddad695e415fb (patch) | |
tree | 7a98f614122fd8658ca1557a06350c8fd0222a12 /rtems/config | |
parent | sb: Change urlib to urllib2 on Python2 and add user agent support. (diff) | |
download | rtems-source-builder-38ed59a301c5f3e03ce83133dadddad695e415fb.tar.bz2 |
sb: Support --dry-run --with-download for 3rd party RTEMS BSP packages.
The building of 3rd party packages for an RTEMS BSP requires a valid
BSP so the standard method to download the source for releasing does
not work. This change adds support to allow this. The RTEMS BSP support
will not generate an error is no BSP or tools are provided or found.
The change addis logic operators to the %if statement so you can '||'
to 'or' and '&&' to 'and' logic expressions.
A new %log directive has been added to clean up the messages.
A new %{!define ...} has been added to aid checking within logic
expressions.
All command line --with/--without now appear as macros.
Add version.version to get just the RTEMS major and minor version.
Some pkg-config issues have been resolved.
Closes #2655.
Diffstat (limited to '')
-rw-r--r-- | rtems/config/rtems-bsp.cfg | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/rtems/config/rtems-bsp.cfg b/rtems/config/rtems-bsp.cfg index d5868ca..2664776 100644 --- a/rtems/config/rtems-bsp.cfg +++ b/rtems/config/rtems-bsp.cfg @@ -12,7 +12,18 @@ # (--with-tools) is not provided use the prefix. # -%if %{_target} == %{nil} +# +# If a dry-run and with download ignore errors and correct setting for tools +# and BSPs. Only after the source to download. +# +%if %{_dry_run} && %{defined with_download} + %log BSP configuration errors ignored + %define rtems_bsp_error 0 +%else + %define rtems_bsp_error 1 +%endif + +%if %{_target} == %{nil} && %{rtems_bsp_error} %error No RTEMS target specified: --rtems-bsp=arch/bsp (or --target=target) %endif @@ -21,7 +32,10 @@ %endif %ifn %{defined with_rtems_bsp} - %error No RTEMS BSP specified: --rtems-bsp=arch/bsp (or --with-rtems-bsp=bsp) + %if %{rtems_bsp_error} + %error No RTEMS BSP specified: --rtems-bsp=arch/bsp (or --with-rtems-bsp=bsp) + %endif + %define with_rtems_bsp sparc/erc32 %endif %ifn %{defined with_tools} @@ -56,12 +70,12 @@ %define rtems_bsp_ldflags %{pkgconfig ldflags %{_host}-%{rtems_bsp}} %define rtems_bsp_libs %{pkgconfig libs %{_host}-%{rtems_bsp}} -%if %{rtems_bsp_cflags} == %{nil} +%if %{rtems_bsp_cflags} == %{nil} && %{rtems_bsp_error} %error No RTEMS target CFLAGS found; Please check the --rtems-bsp option. %endif %if %{rtems_bsp_ccflags} == %{nil} - %define rtems_bsp_ccflags %{rtems_bsp_cflags} + %define rtems_bsp_ccflags %{rtems_bsp_cflags} %endif # |