diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-12-13 15:10:04 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-12-13 15:22:04 +1100 |
| commit | 00b60d74b2c6d648ce511d6fcd02c5bbe9680a38 (patch) | |
| tree | be33fabe995b1f5cf3f3dca076a20b84bf04339c | |
| parent | Remove RTEMS 4.11 unstable. (diff) | |
| download | rtems-source-builder-00b60d74b2c6d648ce511d6fcd02c5bbe9680a38.tar.bz2 | |
Fix the building of the RTEMS Tools from a tar file.
| -rw-r--r-- | rtems/config/4.11/rtems-tools.bset | 10 | ||||
| -rw-r--r-- | rtems/config/tools/rtems-tools-1.cfg | 4 | ||||
| -rw-r--r-- | rtems/config/tools/rtems-tools-common-1.cfg | 7 |
3 files changed, 17 insertions, 4 deletions
diff --git a/rtems/config/4.11/rtems-tools.bset b/rtems/config/4.11/rtems-tools.bset index bdda60e..14cc797 100644 --- a/rtems/config/4.11/rtems-tools.bset +++ b/rtems/config/4.11/rtems-tools.bset @@ -4,4 +4,14 @@ %define release 1 +# +# We need an arch defined for the common RTEMS files to work. +# +%define rtems_arch tools + +# +# The RTEMS 4.11 base defines. +# +%include rtems-4.11-base.bset + tools/rtems-tools-4.11-1 diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg index 652a463..bef9d6b 100644 --- a/rtems/config/tools/rtems-tools-1.cfg +++ b/rtems/config/tools/rtems-tools-1.cfg @@ -1,5 +1,5 @@ # -# RTEMS Tools from git://git.rtems.org/rtems-tools.git +# RTEMS Tools from git for a release. # # @@ -42,7 +42,7 @@ %endif # - # The RTEMS Tools build instructions. We use GIT Release 1. + # The RTEMS Tools build instructions. # %include tools/rtems-tools-common-1.cfg %endif diff --git a/rtems/config/tools/rtems-tools-common-1.cfg b/rtems/config/tools/rtems-tools-common-1.cfg index e1921c3..0de16ba 100644 --- a/rtems/config/tools/rtems-tools-common-1.cfg +++ b/rtems/config/tools/rtems-tools-common-1.cfg @@ -21,10 +21,13 @@ License: BSD-2-Caluse + GPL-2.0 # target location and 'cd ..' fails. build_top=$(pwd) - source_dir_rtems_tools="%{name}" - %source setup rtems-tools -q -D -n %{name} + rtems_tools_source="rtems-tools-%{rtems_tools_version}" + + %source setup rtems-tools -q -n ${rtems_tools_source} %patch setup rtems-tools -p1 + source_dir_rtems_tools=${rtems_tools_source} + cd ${build_top} %build |