diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-12-11 10:48:56 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-12-11 10:48:56 +1100 |
| commit | d4baed93effd9ee55d2accba56a4ad9a3743581a (patch) | |
| tree | 29b58746e7749da4f6ce9dbae4a0c120dde62a0b | |
| parent | Make CVS optional. We should avoid using it. (diff) | |
| download | rtems-source-builder-d4baed93effd9ee55d2accba56a4ad9a3743581a.tar.bz2 | |
Set the RTEMS Tools and Kernel version based on a release.
| -rw-r--r-- | rtems/config/tools/rtems-kernel-4.11.cfg | 6 | ||||
| -rw-r--r-- | rtems/config/tools/rtems-tools-4.11-1.cfg | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/rtems/config/tools/rtems-kernel-4.11.cfg b/rtems/config/tools/rtems-kernel-4.11.cfg index 5d5b708..1a06aef 100644 --- a/rtems/config/tools/rtems-kernel-4.11.cfg +++ b/rtems/config/tools/rtems-kernel-4.11.cfg @@ -25,7 +25,11 @@ %include %{_configdir}/base.cfg %include %{_configdir}/versions.cfg - %define rtems_kernel_version 4.11.0-rc1 + %if %{rsb_released} + %define rtems_kernel_version %{rsb_version} + %else + %define rtems_kernel_version %{rtems_version} + %endif # # A magic internal path that would break if changes in the defaults.mc diff --git a/rtems/config/tools/rtems-tools-4.11-1.cfg b/rtems/config/tools/rtems-tools-4.11-1.cfg index f1c306d..67f8fe2 100644 --- a/rtems/config/tools/rtems-tools-4.11-1.cfg +++ b/rtems/config/tools/rtems-tools-4.11-1.cfg @@ -3,9 +3,13 @@ # # -# Track the release branch. +# The RTEMS Tools version is set to the RSB version or the RTEMS version. # -%define rtems_tools_version %{rsb_version} +%if %{rsb_released} + %define rtems_tools_version %{rsb_version} +%else + %define rtems_tools_version %{rtems_version} +%endif # # The RTEMS Tools build instructions. We use GIT Release 1. |