Changeset 40e4222 in rtems-source-builder


Ignore:
Timestamp:
Dec 10, 2015, 5:54:40 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.9, master
Children:
dfc4a4f
Parents:
fb4ba79
git-author:
Chris Johns <chrisj@…> (12/10/15 05:54:40)
git-committer:
Chris Johns <chrisj@…> (12/11/15 01:11:54)
Message:

Support released downloading of the RTEMS Tools and RTEMS Kernel.

Add a --without-error-reports flags to reduce the noise on --with-downloading.

Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • rtems/config/rtems-urls.bset

    rfb4ba79 r40e4222  
    1212%define rtems_newlib_patches   %{rtems_git_tools}/newlib
    1313%define rtems_gdb_patches      %{rtems_git_tools}/gdb
     14
     15#
     16# Releases paths on the FTP server.
     17#
     18%define rtems_release_url https://ftp.rtems.org/pub/rtems/releases/%{rtems_version}
  • rtems/config/tools/rtems-kernel-4-1.cfg

    rfb4ba79 r40e4222  
    1717# Source
    1818#
    19 %source set rtems http://ftp.rtems.org/pub/rtems/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.bz2
     19%if %{rsb_released}
     20 %if ! %{defined rtems_kernel_compression}
     21  %define rtems_kernel_compression xz
     22 %endif
     23 %source set rtems %{rtems_release_url}/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.%{rtems_kernel_compression}
     24  %define rtems_bootstrap 0
     25%else
     26 %if ! %{defined rtems_kernel_version}
     27  %define rtems_kernel_version HEAD
     28 %endif
     29 %if %{defined rtems_kernel_git_commit_hash}
     30  %define rtems_kernel_git_checkout ?checkout=%{defined rtems_kernel_git_commit_hash}
     31 %else
     32  %define rtems_kernel_git_checkout %{nil}
     33 %endif
     34
     35 %source set rtems git://git.rtems.org/rtems.git?reset=hard?branch=%{rtems_kernel_version}?pull%{rtems_kernel_git_checkout}
     36
     37  #
     38  # The code in git needs to be bootstrapped. Do each build because we have
     39  # no way to change what changes may have happened in the code.
     40  #
     41  %define rtems_bootstrap 1
     42 %endif
    2043
    2144#
  • rtems/config/tools/rtems-kernel-4.10.2.cfg

    rfb4ba79 r40e4222  
    66%include %{_configdir}/base.cfg
    77
    8 %define rtems_kernel_version 4.10.2
     8%define rtems_kernel_version     4.10.2
     9%define rtems_kernel_compression bz2
    910
    1011%hash md5 rtems-%{rtems_kernel_version}.tar.bz2 158566d0f1330d4eaba5a60e757d3dd0
    11 
    12 #
    13 # The code in git needs to be bootstrapped. Do each build because we have
    14 # no way to change what changes may have happened in the code.
    15 #
    16 %define rtems_bootstrap 0
    1712
    1813#
  • rtems/config/tools/rtems-kernel-4.11.cfg

    rfb4ba79 r40e4222  
    1212%endif
    1313
     14#
     15# Build if the RSB is released.
     16#
     17%if ! %{rtems_kernel_build}
     18 %if %{rsb_released}
     19  %define rtems_kernel_build 1
     20 %endif
     21%endif
     22
    1423%if %{rtems_kernel_build}
    1524 %include %{_configdir}/checks.cfg
     
    1726 %include %{_configdir}/versions.cfg
    1827
    19  %define rtems_kernel_version 4.11
     28 %define rtems_kernel_version 4.11.0-rc1
    2029
    2130 #
     
    3746
    3847 #
    39  # Pull the latest changes from git each build. Override if this is not what you
    40  # want.
    41  #
    42  %source set rtems git://git.rtems.org/rtems.git?reset=hard?pull
    43 
    44  #
    45  # The code in git needs to be bootstrapped. Do each build because we have
    46  # no way to change what changes may have happened in the code.
    47  #
    48  %define rtems_bootstrap
    49 
    50  #
    5148 # The RTEMS build instructions. We use 4.xx Release 1.
    5249 #
  • rtems/config/tools/rtems-kernel-4.9.6-1.cfg

    rfb4ba79 r40e4222  
    66%include %{_configdir}/base.cfg
    77
    8 %define rtems_kernel_version 4.9.6
    9 
    10 #
    11 # The code in git needs to be bootstrapped. Do each build because we have
    12 # no way to change what changes may have happened in the code.
    13 #
    14 %define rtems_bootstrap
     8%define rtems_kernel_version     4.9.6
     9%define rtems_kernel_compression bz2
    1510
    1611#
  • rtems/config/tools/rtems-tools-1.cfg

    rfb4ba79 r40e4222  
    2222%if %{rtems_tools_build}
    2323 #
    24  # Pull the latest changes from git each build. Override if this is not what you
    25  # want.
     24 # If the RSB is released look for a release tarball else use git.
    2625 #
    27  %if %{defined rtems_tools_version}
    28   %define rtems_tools_git_checkout ?checkout=%{rtems_tools_version}
     26 %if %{rsb_released}
     27  %source set rtems-tools %{rtems_release_url}/%{rtems_tools_version}/rtems-tools-%{rtems_tools_version}.tar.xz
    2928 %else
    30   %define rtems_tools_version HEAD
    31   %define rtems_tools_git_checkout %{nil}
     29  #
     30  # rtems_git_commit_hash : The commit hash else the branch is tracked.
     31  #
     32  %if ! %{defined rtems_tools_version}
     33   %define rtems_tools_version HEAD
     34  %endif
     35  %if %{defined rtems_tools_git_commit_hash}
     36   %define rtems_tools_git_checkout ?checkout=%{defined rtems_tools_git_commit_hash}
     37  %else
     38   %define rtems_tools_git_checkout %{nil}
     39  %endif
     40
     41  %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
    3242 %endif
    33  %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?branch=master?pull%{rtems_tools_git_checkout}
    3443
    3544 #
    3645 # The RTEMS Tools build instructions. We use GIT Release 1.
    3746 #
    38  %include tools/rtems-tools-git-1.cfg
     47 %include tools/rtems-tools-common-1.cfg
    3948%endif
  • rtems/config/tools/rtems-tools-4.11-1.cfg

    rfb4ba79 r40e4222  
    33#
    44
    5 # Wait for the release and until then track head.
    6 # %define rtems_tools_version 2015c854c54ac13d3712ddb58e946659dcc617dc
     5#
     6# Track the release branch.
     7#
     8%define rtems_tools_version %{rsb_version}
    79
    810#
  • source-builder/defaults.mc

    rfb4ba79 r40e4222  
    4646buildname:           none,    none,     '%{name}'
    4747
    48 # The default is not release.
    49 is_rsb_release:      none,    none,     '0'
     48# The default is not released.
     49rsb_released:        none,    none,     '0'
     50rsb_version:         none,    none,     'no-version'
    5051
    5152# GNU triples needed to build packages
  • source-builder/sb/build.py

    rfb4ba79 r40e4222  
    112112
    113113    def _generate_report_(self, header, footer = None):
    114         ereport.generate('rsb-report-%s.txt' % self.macros['name'],
    115                          self.opts, header, footer)
     114        label, result = self.opts.with_arg('error-report')
     115        if label.startswith('without') and result == 'no':
     116            ereport.generate('rsb-report-%s.txt' % self.macros['name'],
     117                             self.opts, header, footer)
    116118
    117119    def __init__(self, name, create_tar_files, opts, macros = None):
  • source-builder/sb/options.py

    rfb4ba79 r40e4222  
    304304    def sb_released(self):
    305305        if version.released():
    306             self.defaults['is_rsb_released'] = '1'
    307             self.defaults['_sbreleased'] = '1'
    308             self.defaults['_sbversion'] = version.str()
     306            self.defaults['rsb_released'] = '1'
     307        self.defaults['rsb_version'] = version.str()
    309308
    310309    def sb_git(self):
Note: See TracChangeset for help on using the changeset viewer.