diff options
| author | Chris Johns <chrisj@rtems.org> | 2018-02-08 16:13:40 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2018-02-08 16:15:03 +1100 |
| commit | 9f4ed7e316e9803bd39c474012dc7914ef339fdd (patch) | |
| tree | 1df87c856ec6ed15fb5ade89a74484ff260c75c2 | |
| parent | sb: Option --source-only-download does not download the source. (diff) | |
| download | rtems-source-builder-9f4ed7e316e9803bd39c474012dc7914ef339fdd.tar.bz2 | |
rtems: Do not build the RTEMS kernel by default in releases.
Close #3292
| -rw-r--r-- | rtems/config/tools/rtems-kernel-4-1.cfg | 2 | ||||
| -rw-r--r-- | source-builder/sb/build.py | 7 | ||||
| -rw-r--r-- | source-builder/sb/config.py | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg index e13458d..6349be7 100644 --- a/rtems/config/tools/rtems-kernel-4-1.cfg +++ b/rtems/config/tools/rtems-kernel-4-1.cfg @@ -31,7 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) # Build if the RSB is released or optionally enable/disable building the RTEMS # kernel via the command line. # -%if %{rsb_released} || %{defined with_rtems} +%if %{defined with_rtems} %define rtems_kernel_build 1 %else %define rtems_kernel_build 0 diff --git a/source-builder/sb/build.py b/source-builder/sb/build.py index b995e6b..e28a831 100644 --- a/source-builder/sb/build.py +++ b/source-builder/sb/build.py @@ -111,11 +111,8 @@ class build: return name def _generate_report_(self, header, footer = None): - label, result = self.opts.with_arg('error-report') - if (label.startswith('without_') and result != 'yes') or \ - (label.startswith('with_') and result != 'no'): - ereport.generate('rsb-report-%s.txt' % self.macros['name'], - self.opts, header, footer) + ereport.generate('rsb-report-%s.txt' % self.macros['name'], + self.opts, header, footer) def __init__(self, name, create_tar_files, opts, macros = None): try: diff --git a/source-builder/sb/config.py b/source-builder/sb/config.py index da54ba3..a4f739b 100644 --- a/source-builder/sb/config.py +++ b/source-builder/sb/config.py @@ -422,7 +422,8 @@ class file: def _pkgconfig_check(self, test): # Hack to by pass pkgconfig checks when just wanting to download the # source. - if self.macros['_dry_run'] == '1' and self.macros['with_download'] == '1': + if self.macros['_dry_run'] == '1' and \ + ('with_download' in self.macros and self.macros['with_download'] == '1'): return '0' ok = False if type(test) == str: |