diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-12-15 11:15:28 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-12-15 11:15:28 +1100 |
| commit | 3ffbfc809291e06b606cdf16539cc7d776b15877 (patch) | |
| tree | b7b2e88037e88d40e50a65c17a0866ab048a5882 | |
| parent | Download source from RTEMS if a release. (diff) | |
| download | rtems-source-builder-3ffbfc809291e06b606cdf16539cc7d776b15877.tar.bz2 | |
Fix 4.11/rtems-tools so it builds from git.
| -rw-r--r-- | rtems/config/4.12/rtems-tools.bset | 17 | ||||
| -rw-r--r-- | rtems/config/tools/rtems-tools-4.12-1.cfg | 14 | ||||
| -rw-r--r-- | rtems/config/tools/rtems-tools-common-1.cfg | 6 |
3 files changed, 36 insertions, 1 deletions
diff --git a/rtems/config/4.12/rtems-tools.bset b/rtems/config/4.12/rtems-tools.bset new file mode 100644 index 0000000..2fb60e2 --- /dev/null +++ b/rtems/config/4.12/rtems-tools.bset @@ -0,0 +1,17 @@ +# +# Tools Set for RTEMS 4.12 Tools Stable +# + +%define release 1 + +# +# We need an arch defined for the common RTEMS files to work. +# +%define rtems_arch tools + +# +# The RTEMS 4.12 base defines. +# +%include rtems-4.12-base.bset + +tools/rtems-tools-4.12-1 diff --git a/rtems/config/tools/rtems-tools-4.12-1.cfg b/rtems/config/tools/rtems-tools-4.12-1.cfg index 7b5eb7e..0a7a7e2 100644 --- a/rtems/config/tools/rtems-tools-4.12-1.cfg +++ b/rtems/config/tools/rtems-tools-4.12-1.cfg @@ -1 +1,15 @@ +# +# RTEMS Tools for 4.12. +# + +# +# The RTEMS Tools version is set to the RSB version or the RTEMS version. +# +%if %{rsb_released} + %define rtems_tools_version %{rsb_version} +%endif + +# +# The RTEMS Tools build instructions. We use tools 1. +# %include tools/rtems-tools-1.cfg diff --git a/rtems/config/tools/rtems-tools-common-1.cfg b/rtems/config/tools/rtems-tools-common-1.cfg index 0de16ba..60aa5c1 100644 --- a/rtems/config/tools/rtems-tools-common-1.cfg +++ b/rtems/config/tools/rtems-tools-common-1.cfg @@ -21,7 +21,11 @@ License: BSD-2-Caluse + GPL-2.0 # target location and 'cd ..' fails. build_top=$(pwd) - rtems_tools_source="rtems-tools-%{rtems_tools_version}" + %if %{rsb_released} + rtems_tools_source="rtems-tools-%{rtems_tools_version}" + %else + rtems_tools_source="rtems-tools.git" + %endif %source setup rtems-tools -q -n ${rtems_tools_source} %patch setup rtems-tools -p1 |