diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-04-15 11:51:55 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-04-15 11:59:30 +1000 |
| commit | 70fc466b48186c2bf192f5bf656cbbd5da3270a2 (patch) | |
| tree | b73fcdab6338c152837f80a90add7ddcb7020997 /rtems/config/4.12 | |
| parent | 4.12: Add the newlib patch to get the updated ctr0.o. (diff) | |
| download | rtems-source-builder-70fc466b48186c2bf192f5bf656cbbd5da3270a2.tar.bz2 | |
rtems: Refactor to move to a single version on master.
Move the 4.12 version and base defines to just RTEMS base defines
which includes the version. This removes the version from a number of
files and makes it simpler to move to a new version. It however means
we cannot support more than version on master.
This change further breaks 4.10 and 4.9 however it means we can
branch these versions and better support them on their branches.
Diffstat (limited to 'rtems/config/4.12')
| -rw-r--r-- | rtems/config/4.12/rtems-autotools-base.bset | 4 | ||||
| -rw-r--r-- | rtems/config/4.12/rtems-default.bset | 10 | ||||
| -rw-r--r-- | rtems/config/4.12/rtems-epiphany.bset | 4 | ||||
| -rw-r--r-- | rtems/config/4.12/rtems-m32c.bset | 4 | ||||
| -rw-r--r-- | rtems/config/4.12/rtems-or1k.bset | 5 | ||||
| -rw-r--r-- | rtems/config/4.12/rtems-tools.bset | 4 |
6 files changed, 19 insertions, 12 deletions
diff --git a/rtems/config/4.12/rtems-autotools-base.bset b/rtems/config/4.12/rtems-autotools-base.bset index f68df75..e208a10 100644 --- a/rtems/config/4.12/rtems-autotools-base.bset +++ b/rtems/config/4.12/rtems-autotools-base.bset @@ -7,9 +7,9 @@ %define rtems_arch none # -# The RTEMS 4.12 base defines. +# The RTEMS base defines. # -%include rtems-4.12-base.bset +%include rtems-base.bset # # The autotools package. diff --git a/rtems/config/4.12/rtems-default.bset b/rtems/config/4.12/rtems-default.bset index 70520ed..cd850e8 100644 --- a/rtems/config/4.12/rtems-default.bset +++ b/rtems/config/4.12/rtems-default.bset @@ -1,6 +1,14 @@ -%include rtems-4.12-base.bset +# +# Default tools configuration. +# + +# +# The RTEMS base defines +# +%include rtems-base.bset 4.12/rtems-autotools + devel/expat-2.1.0-1 tools/rtems-binutils-2.26-1 tools/rtems-gcc-6-20160327-newlib-2.4.0-1 diff --git a/rtems/config/4.12/rtems-epiphany.bset b/rtems/config/4.12/rtems-epiphany.bset index 407e382..a6c95a2 100644 --- a/rtems/config/4.12/rtems-epiphany.bset +++ b/rtems/config/4.12/rtems-epiphany.bset @@ -33,9 +33,9 @@ %hash md5 f05996c7c42e6b2781946acbab153a481ce3fd0b.zip 05a4b208151a079bfbe2bed9c592ab43 # -# The RTEMS 4.12 base defines. +# The RTEMS base defines. # -%include rtems-4.12-base.bset +%include rtems-base.bset # # Tools configuration. diff --git a/rtems/config/4.12/rtems-m32c.bset b/rtems/config/4.12/rtems-m32c.bset index 9ff4a80..df8b9b5 100644 --- a/rtems/config/4.12/rtems-m32c.bset +++ b/rtems/config/4.12/rtems-m32c.bset @@ -7,9 +7,9 @@ %define rtems_arch m32c # -# The RTEMS 4.12 base defines. +# The RTEMS base defines. # -%include rtems-4.12-base.bset +%include rtems-base.bset # # Disable building a C++ compiler. diff --git a/rtems/config/4.12/rtems-or1k.bset b/rtems/config/4.12/rtems-or1k.bset index d80bf59..8f10563 100644 --- a/rtems/config/4.12/rtems-or1k.bset +++ b/rtems/config/4.12/rtems-or1k.bset @@ -7,9 +7,9 @@ %define rtems_arch or1k # -# The RTEMS 4.12 base defines. +# The RTEMS base defines. # -%include rtems-4.12-base.bset +%include rtems-base.bset # # or1k specific patches @@ -41,4 +41,3 @@ tools/rtems-binutils-2.26-1 tools/rtems-gcc-4.9.3-newlib-2.4.0-1.cfg tools/rtems-tools-4.12-1 tools/rtems-gdb-7.11-1 - diff --git a/rtems/config/4.12/rtems-tools.bset b/rtems/config/4.12/rtems-tools.bset index 2fb60e2..6332b5c 100644 --- a/rtems/config/4.12/rtems-tools.bset +++ b/rtems/config/4.12/rtems-tools.bset @@ -10,8 +10,8 @@ %define rtems_arch tools # -# The RTEMS 4.12 base defines. +# The RTEMS base defines. # -%include rtems-4.12-base.bset +%include rtems-base.bset tools/rtems-tools-4.12-1 |