From: Chris Johns <chr...@rtems.org> Updates #4045 --- user/rsb/commands.rst | 40 ------------------------------- user/rsb/configuration.rst | 49 +++++++++++--------------------------- 2 files changed, 14 insertions(+), 75 deletions(-)
diff --git a/user/rsb/commands.rst b/user/rsb/commands.rst index b4787aa..04d3cea 100644 --- a/user/rsb/commands.rst +++ b/user/rsb/commands.rst @@ -295,43 +295,3 @@ The ``arguments`` are a list of build sets to build. ``--list-deps``: Print a list of dependent files used by a build set. Dependent files have a ``dep[?]` prefix where ``?`` is a number. The files are listed alphabetically. - -Set Builder (sb-builder) -^^^^^^^^^^^^^^^^^^^^^^^^ - -This command builds a configuration as described in a configuration -file. Configuration files have the extension of ``.cfg``: - -.. code-block:: none - - $ ./source-builder/sb-builder --help - sb-builder: [options] [args] - RTEMS Source Builder, an RTEMS Tools Project (c) 2012 Chris Johns - Options and arguments: - --force : Force the build to proceed - --quiet : Quiet output (not used) - --trace : Trace the execution - --dry-run : Do everything but actually run the build - --warn-all : Generate warnings - --no-clean : Do not clean up the build tree - --always-clean : Always clean the build tree, even with an error - --jobs : Run with specified number of jobs, default: num CPUs. - --host : Set the host triplet - --build : Set the build triplet - --target : Set the target triplet - --prefix path : Tools build prefix, ie where they are installed - --topdir path : Top of the build tree, default is $PWD - --configdir path : Path to the configuration directory, default: ./config - --builddir path : Path to the build directory, default: ./build - --sourcedir path : Path to the source directory, default: ./source - --patchdir path : Path to the patches directory, default: ./patches - --tmppath path : Path to the temp directory, default: ./tmp - --macros file[,[file] : Macro format files to load after the defaults - --log file : Log file where all build out is written too - --url url[,url] : URL to look for source - --targetcflags flags : List of C flags for the target code - --targetcxxflags flags : List of C++ flags for the target code - --libstdcxxflags flags : List of C++ flags to build the target libstdc++ code - --with-<label> : Add the --with-<label> to the build - --without-<label> : Add the --without-<label> to the build - --list-configs : List available configurations diff --git a/user/rsb/configuration.rst b/user/rsb/configuration.rst index e31d1bb..1403c4f 100644 --- a/user/rsb/configuration.rst +++ b/user/rsb/configuration.rst @@ -40,8 +40,7 @@ The configuration search path is a macro variable and is reference as Build set files have the file extension ``.bset`` and the package build configuration files have the file extension of ``.cfg``. The ``sb-set-builder`` -command will search for *build sets* and the ``sb-builder`` commands works with -package build configuration files. +command will search for *build sets*. Both types of configuration files use the ``#`` character as a comment character. Anything after this character on the line is ignored. There is no @@ -450,13 +449,12 @@ tools. File naming provides configuration management. A specific version of a package is captured in a specific set of configuration files. The top level -configuration file referenced in a *build set* or passed to the ``sb-builder`` -command relates to a specific configuration of the package being built. For -example the RTEMS configuration file ``rtems-gcc-4.7.2-newlib-2.0.0-1.cfg`` -creates an RTEMS GCC and Newlib package where the GCC version is 4.7.2, the -Newlib version is 2.0.0, plus any RTEMS specific patches that related to this -version. The configuration defines the version numbers of the various parts -that make up this package: +configuration file referenced in a *build set* relates to a specific +configuration of the package being built. For example the RTEMS configuration +file ``rtems-gcc-4.7.2-newlib-2.0.0-1.cfg`` creates an RTEMS GCC and Newlib +package where the GCC version is 4.7.2, the Newlib version is 2.0.0, plus any +RTEMS specific patches that related to this version. The configuration defines +the version numbers of the various parts that make up this package: .. code-block:: spec @@ -736,28 +734,11 @@ Finally there is an optional clean section. The RSB will run this section if ``--no-clean`` has not been provided on the command line. The RSB does clean up for you. -Once we have the configuration files we can execute the build using the -``sb-builder`` command. The command will perform the build and create a tar file -in the ``tar`` directory: - -.. code-block:: none - - $ ../source-builder/sb-builder --prefix=/usr/local \ - --log=log_dtc devel/dtc-1.2.0 - RTEMS Source Builder, Package Builder v0.2.0 - config: devel/dtc-1.2.0 - package: dtc-1.2.0-x86_64-freebsd9.1-1 - download: https://www.kernel.org/pub/software/utils/dtc/dtc-v1.2.0.tgz -> sources/dtc-v1.2.0.tgz - building: dtc-1.2.0-x86_64-freebsd9.1-1 - $ ls tar - dtc-1.2.0-x86_64-freebsd9.1-1.tar.bz2 - -If you want to have the package installed automatically you need to create a -build set. A build set can build one or more packages from their configurations -at once to create a single package. For example the GNU tools is typically seen -as binutils, GCC and GDB and a build set will build each of these packages and -create a single build set tar file or install the tools on the host into the -prefix path. +To have a package installed automatically create a build set. A build set can +build one or more packages from their configurations at once to create a +single package. For example the GNU tools is typically seen as binutils, GCC +and GDB and a build set will build each of these packages and create a single +build set tar file or install the tools on the host into the prefix path. The DTC build set file is called ``dtc.bset`` and contains: @@ -1591,12 +1572,10 @@ The ``%endif`` macro ends a conditional logic block. ~~~~~~~~~~~ The ``%bconf_with`` macro provides a way to test if the user has passed a -specific option on the command line with the ``--with-<label>`` option. This -option is only available with the ``sb-builder`` command. +specific option on the command line with the ``--with-<label>`` option. %bconf_without ~~~~~~~~~~~~~~ The ``%bconf_without`` macro provides a way to test if the user has passed a -specific option on the command line with the ``--without-<label>`` option. This -option is only available with the ``sb-builder`` command. +specific option on the command line with the ``--without-<label>`` option. -- 2.24.1 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel