Ticket #2562: 0001-version-number-notation-Ticket-2562-GCI-2018.patch

File 0001-version-number-notation-Ticket-2562-GCI-2018.patch, 11.3 KB (added by shashvat jain, on 11/18/18 at 14:21:31)

  • rsb/configuration.rst 

    From 8ffa38cbe64c7be971bc8d6a928126e82f653d3c Mon Sep 17 00:00:00 2001
From: pritishjain <pritishjain2001@gmail.com>
Date: Sun, 18 Nov 2018 19:39:32 +0530
Subject: [PATCH] version number notation: Ticket #2562 (GCI 2018)

---
 rsb/configuration.rst        | 12 ++++++------
 rsb/cross-canadian-cross.rst | 23 ++++++++++++++---------
 rsb/project-sets.rst         | 34 ++++++++++++++++++++++++----------
 rsb/third-party-packages.rst | 25 +++++++++++++++----------
 user/start/index.rst         | 22 ++++++++++++++++++----
 5 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/rsb/configuration.rst b/rsb/configuration.rst
index b2745a5..82505da 100644
    a b configuration files. 
    402402
    403403Defining macros is performed with the ``%define`` macro::
    404404
    405     %define _target m32r-rtems4.11
     405    %define _target m32r-rtems**urversion**
    406406
    407407Inline including another file with the ``%include`` macro continues processing
    408408with the specified file returning to carry on from just after the include
    409409point::
    410410
    411     %include rtems-4.11-base.bset
     411    %include rtems-**urversion**-base.bset
    412412
    413 This includes the RTEMS 4.11 base set of defines and checks. The configuration
     413This includes the RTEMS **urversion** base set of defines and checks. The configuration
    414414paths as defined by ``_configdir`` are scanned. The file extension is optional.
    415415
    416416You reference build set or package configuration files by placing the file name
    … … The generic configuration may provide defaults in case options are not 
    460460specified. The patches this specific version of the package requires can be
    461461included::
    462462
    463     Patch0: gcc-4.7.2-rtems4.11-20121026.diff
     463    Patch0: gcc-4.7.2-rtems**urversion**-20121026.diff
    464464
    465465Finally including the GCC 4.7 configuration script::
    466466
    … … The ``__patchdir`` path is searched. 
    12721272
    12731273To add a patch::
    12741274
    1275     %patch add gcc <1>  gcc-4.7.2-rtems4.11-20121026.diff
    1276     %patch add gcc -p0 <2>  gcc-4.7.2-rtems4.11-20121101.diff
     1275    %patch add gcc <1>  gcc-4.7.2-rtems**urversion**-20121026.diff
     1276    %patch add gcc -p0 <2>  gcc-4.7.2-rtems**urversion**-20121101.diff
    12771277
    12781278.. topic:: Items:
    12791279

  • rsb/cross-canadian-cross.rst 

    diff --git a/rsb/cross-canadian-cross.rst b/rsb/cross-canadian-cross.rst
index d4fce9e..805c8f6 100644
    a b To build the NTP package for RTEMS you enter the RSB command:: 
    2525
    2626    $ ../source-builder/sb-set-builder \
    2727       --log=log_ntp_arm.txt \
    28        --prefix=$HOME/development/rtems/4.11 \  <1>
    29        --host=arm-rtems4.11 \  <2>
     28       --prefix=$HOME/development/rtems/**urversion** \  <1>
     29       --host=arm-rtems**urversion** \  <2>
    3030       --with-rtems-bsp=xilinx_zynq_zc706 \  <3>
    31        4.11/net/ntp
     31       **urversion**/net/ntp
     32
     33.. topic:: Note :
     34  In the above commands and all commands on this page, **urversion** gives the version
     35  of RTEMS you are building or want to build. Replace it with reference to release version table on
     36  *projects sets* page .
    3237
    3338.. topic:: Items:
    3439
    … … to build a MinGW tool set on FreeBSD for Windows add ``--host=mingw32`` 
    8590if the cross compiler is ``mingw32-gcc``::
    8691
    8792    $ ../source-builder/sb-set-builder --host=mingw32 \
    88        --log=l-mingw32-4.11-sparc.txt \
    89        --prefix=$HOME/development/rtems/4.11 \
    90        4.11/rtems-sparc
     93       --log=l-mingw32-**urversion**-sparc.txt \
     94       --prefix=$HOME/development/rtems/**urversion** \
     95       **urversion**/rtems-sparc
    9196
    9297If you are on a Linux Fedora build host with the MinGW packages installed the
    9398command line is::
    9499
    95100    $ ../source-builder/sb-set-builder --host=i686-w64-mingw32 \
    96        --log=l-mingw32-4.11-sparc.txt \
    97        --prefix=$HOME/development/rtems/4.11 \
    98        4.11/rtems-sparc
     101       --log=l-mingw32-**urversion**-sparc.txt \
     102       --prefix=$HOME/development/rtems/**urversion** \
     103       **urversion**/rtems-sparc

  • rsb/project-sets.rst 

    diff --git a/rsb/project-sets.rst b/rsb/project-sets.rst
index 8abd080..01e1480 100644
    a b If you are building a released version of RTEMS the release RTEMS tar file will 
    9494be downloaded and built as part of the build process. If you are building a
    9595tool set for use with the development branch of RTEMS, the development branch
    9696will be cloned directly from the RTEMS GIT repository and built.
     97               +----------------+----------------+
     98               | Release(Notes) |    Status      |
     99               +================+================+
     100               |        5       |  development   |
     101               +----------------+----------------+
     102               |       4.11     |current release |
     103               +----------------+----------------+
     104               |       4.10     |previous release|
     105               +----------------+----------------+
     106
    97107
    98108When building RTEMS within the RTEMS Source Builder it needs a suitable working
    99109``autoconf`` and ``automake``. These packages need to built and installed in their
    … … packages only after they have been built so if you host does not have a 
    102112recent enough version of ``autoconf`` and ``automake`` you first need to build them
    103113and install them then build your tool set. The commands are::
    104114
    105     $ ../source-builder/sb-set-builder --log=l-4.11-at.txt \
    106        --prefix=$HOME/development/rtems/4.11 4.11/rtems-autotools
    107     $ export PATH=~/development/rtems/4.11/bin:$PATH    <1>
    108     $ ../source-builder/sb-set-builder --log=l-4.11-sparc.txt \
    109        --prefix=$HOME/development/rtems/4.11 4.11/rtems-sparc
     115    $ ../source-builder/sb-set-builder --log=l-**urversion**-at.txt \
     116       --prefix=$HOME/development/rtems/**urversion** **urversion**/rtems-autotools
     117    $ export PATH=~/development/rtems/**urversion**/bin:$PATH    <1>
     118    $ ../source-builder/sb-set-builder --log=l-**urversion**-sparc.txt \
     119       --prefix=$HOME/development/rtems/**urversion** **urversion**/rtems-sparc
     120
     121.. topic:: Note :
     122  In the above commands and all commands on this page, **urversion** gives the version
     123  of RTEMS you want to build.
    110124
    111125.. topic:: Items:
    112126
    … … passing them on the command line using the ``--macros`` option. For RTEMS these 
    122136are held in ``config/snapshots`` directory. The following builds *newlib* from
    123137CVS::
    124138
    125     $ ../source-builder/sb-set-builder --log=l-4.11-sparc.txt \
    126        --prefix=$HOME/development/rtems/4.11 \
     139    $ ../source-builder/sb-set-builder --log=l-**urversion**-sparc.txt \
     140       --prefix=$HOME/development/rtems/**urversion** \
    127141       --macros=snapshots/newlib-head.mc \
    128        4.11/rtems-sparc
     142       **urversion**/rtems-sparc
    129143
    130144and the following uses the version control heads for ``binutils``, ``gcc``,
    131145``newlib``, ``gdb`` and *RTEMS*::
    132146
    133147    $ ../source-builder/sb-set-builder --log=l-heads-sparc.txt \
    134        --prefix=$HOME/development/rtems/4.11-head \
     148       --prefix=$HOME/development/rtems/**urversion**-head \
    135149       --macros=snapshots/binutils-gcc-newlib-gdb-head.mc \
    136        4.11/rtems-sparc
     150       **urversion**/rtems-sparc
    137151
    138152Patches
    139153-------

  • rsb/third-party-packages.rst 

    diff --git a/rsb/third-party-packages.rst b/rsb/third-party-packages.rst
index 21d9887..1aaf739 100644
    a b To build Net-SNMP the command is: 
    4444
    4545    $ cd rtems-source-builder/rtems
    4646    $ ../source-builder/sb-set-builder --log=log_sis_net_snmp \
    47         --prefix=$HOME/development/rtems/bsps/4.11 \
    48         --with-tools=$HOME/development/rtems/4.11 \
    49         --host=sparc-rtems4.11 --with-rtems-bsp=erc32 4.11/net-mgmt/net-snmp
     47        --prefix=$HOME/development/rtems/bsps/**urversion** \
     48        --with-tools=$HOME/development/rtems/**urversion** \
     49        --host=sparc-rtems**urversion** --with-rtems-bsp=erc32 **urversion**/net-mgmt/net-snmp
    5050    RTEMS Source Builder - Set Builder, v0.3.0
    51     Build Set: 4.11/net-mgmt/net-snmp
     51    Build Set: **urversion**/net-mgmt/net-snmp
    5252    config: net-mgmt/net-snmp-5.7.2.1-1.cfg
    53     package: net-snmp-5.7.2.1-sparc-rtems4.11-1
    54     building: net-snmp-5.7.2.1-sparc-rtems4.11-1
    55     installing: net-snmp-5.7.2.1-sparc-rtems4.11-1 -> /Users/chris/development/rtems/bsps/4.11
    56     cleaning: net-snmp-5.7.2.1-sparc-rtems4.11-1
     53    package: net-snmp-5.7.2.1-sparc-rtems**urversion**-1
     54    building: net-snmp-5.7.2.1-sparc-rtems**urversion**-1
     55    installing: net-snmp-5.7.2.1-sparc-rtems**urversion**-1 -> /Users/chris/development/rtems/bsps/**urversion**
     56    cleaning: net-snmp-5.7.2.1-sparc-rtems**urversion**-1
    5757    Build Set: Time 0:01:10.651926
    5858
     59.. topic:: Note :
     60    In the above commands and all commands on this page, **urversion** gives the version
     61    of RTEMS you are building or want to build. Replace it with reference to release version table on
     62    *projects sets* page .
     63
    5964Adding
    6065------
    6166
    … … A package requires 3 files to be created: 
    8691
    8792- The first file is the RTEMS build set file and it resides in the
    8893  ``rtems/config/%{rtems_version}`` path in a directory tree based on the
    89   FreeBSD ports collection. For the NTP package and RTEMS 4.11 this is
    90   ``rtems/config/4.11/net/ntp.bset``. If you do not know the FreeBSD port path
     94  FreeBSD ports collection. For the NTP package and RTEMS **urversion** this is
     95  ``rtems/config/**urversion**/net/ntp.bset``. If you do not know the FreeBSD port path
    9196  for the package you are adding please ask. The build set file references a
    9297  specific configuration file therefore linking the RTEMS version to a specific
    9398  version of the package you are adding. Updating the package to a new version

  • user/start/index.rst 

    diff --git a/user/start/index.rst b/user/start/index.rst
index 1016678..6a20886 100644
    a b of possible locations and set ups. 
    5151
    5252Simple Example
    5353==============
     54.. topic:: Note :
     55  In all the commands on this page, **urversion** gives the version
     56  of RTEMS you want to build. Here is a table about RTEMS release versions
     57
     58                 +----------------+----------------+
     59                 | Release(Notes) |    Status      |
     60                 +================+================+
     61                 |        5       |  development   |
     62                 +----------------+----------------+
     63                 |       4.11     |current release |
     64                 +----------------+----------------+
     65                 |       4.10     |previous release|
     66                 +----------------+----------------+
     67
    5468
    5569.. code-block:: shell
    5670
    … … Simple Example 
    6478    ...
    6579  $ cd rtems
    6680  $ ../source-builder/sb-set-builder \
    67       --prefix=/usr/home/chris/development/rtems/5 5/rtems-sparc
     81      --prefix=/usr/home/chris/development/rtems/**urversion** **urversion**/rtems-sparc
    6882    ...
    6983
    7084Build the RTEMS Kernel (:ref:`rtems-kernel-install`) by cloning the repository,
    … … kernel: 
    7387
    7488.. code-block:: shell
    7589
    76   $ export PATH=$HOME/development/rtems/5/bin:$PATH
     90  $ export PATH=$HOME/development/rtems/**urversion**/bin:$PATH
    7791  $ cd
    7892  $ cd development/rtems
    7993  $ mkdir kernel
    … … kernel: 
    86100  $ cd ..
    87101  $ mkdir erc32
    88102  $ cd erc32
    89   $ $HOME/development/rtems/kernel/rtems/configure --prefix=$HOME/development/rtems/5 \
    90                      --target=sparc-rtems5 --enable-rtemsbsp=erc32 --enable-posix
     103  $ $HOME/development/rtems/kernel/rtems/configure --prefix=$HOME/development/rtems/**urversion** \
     104                     --target=sparc-rtems**urversion** --enable-rtemsbsp=erc32 --enable-posix
    91105    ...
    92106  $ make -j 8
    93107    ...