summaryrefslogtreecommitdiffstats
path: root/rtems/config/tools
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2013-03-11 10:58:40 +1100
committerChris Johns <chrisj@rtems.org>2013-03-11 10:58:40 +1100
commit48e1cd44ee04250d0b283bcae4edba22a778d972 (patch)
tree045bf4afabea936eadc97e33b9d6d15f4ceaab46 /rtems/config/tools
parentImprove the parsing in build set files. (diff)
downloadrtems-source-builder-48e1cd44ee04250d0b283bcae4edba22a778d972.tar.bz2
Move all patches to the rtems-tools.git repo.
All patches are now downloaded. No patches or source is held in the RTEMS Source Builder repo. As part of this the build sets now have a single rtems_arch define and the base RTEMS 4.11 build set now creates the _target macro. With this change a method to manage RTEMS specific patches has been put in place where build sets can define patches. This avoids needing special configuration files.
Diffstat (limited to 'rtems/config/tools')
-rw-r--r--rtems/config/tools/rtems-binutils-2.22-1.cfg5
-rw-r--r--rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg3
-rw-r--r--rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg5
-rw-r--r--rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg3
-rw-r--r--rtems/config/tools/rtems-gdb-7.5-1.cfg3
-rw-r--r--rtems/config/tools/rtems-gdb-7.5.1-1.cfg5
-rw-r--r--rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg2
-rw-r--r--rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg11
8 files changed, 21 insertions, 16 deletions
diff --git a/rtems/config/tools/rtems-binutils-2.22-1.cfg b/rtems/config/tools/rtems-binutils-2.22-1.cfg
index 5c35761..acd5965 100644
--- a/rtems/config/tools/rtems-binutils-2.22-1.cfg
+++ b/rtems/config/tools/rtems-binutils-2.22-1.cfg
@@ -7,9 +7,8 @@
%define binutils_version 2.22
-Patch0: binutils-2.22-rtems4.11-20120427.diff
-Patch1: binutils-2.22-rtems4.11-moxie-20130214.diff
-
+Patch0: %{rtems_binutils_patches}/binutils-2.22-rtems4.11-20120427.diff
+%include rtems-binutils-patches.cfg
#
# The binutils build instructions. We use 2.xx Release 1.
#
diff --git a/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg
index 4936600..683393a 100644
--- a/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg
@@ -26,7 +26,8 @@
#
# Libiberty strsignal fix
#
-Patch2: gcc-4.5.3-strsignal-1.diff
+Patch0: %{rtems_gcc_patches}/gcc-4.5.3-strsignal-1.diff
+%include rtems-gcc-patches.cfg
#
# The gcc/newlib build instructions. We use 4.5 Release 1.
diff --git a/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg b/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg
index 59d7ec8..04d2f97 100644
--- a/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg
@@ -47,8 +47,9 @@
#
# The RTEMS 4.11 patches
#
-Patch0: gcc-4.7.2-rtems4.11-20121026.diff
-Patch10: newlib-1.20.0-rtems4.11-20121011.diff
+Patch0: %{rtems_gcc_patches}/gcc-4.7.2-rtems4.11-20121026.diff
+Patch10: %{rtems_newlib_patches}/newlib-1.20.0-rtems4.11-20121011.diff
+%include rtems-gcc-patches.cfg
#
# The gcc/newlib build instructions. We use 4.7 Release 1.
diff --git a/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg
index 4dc2430..d3dfeb3 100644
--- a/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg
@@ -26,7 +26,8 @@
#
# The RTEMS 4.11 patches
#
-Patch0: gcc-4.7.2-rtems4.11-20121026.diff
+Patch0: %{rtems_gcc_patches}/gcc-4.7.2-rtems4.11-20121026.diff
+%include rtems-gcc-patches.cfg
#
# The gcc/newlib build instructions. We use 4.7 Release 1.
diff --git a/rtems/config/tools/rtems-gdb-7.5-1.cfg b/rtems/config/tools/rtems-gdb-7.5-1.cfg
index 27e8b37..5a76c9b 100644
--- a/rtems/config/tools/rtems-gdb-7.5-1.cfg
+++ b/rtems/config/tools/rtems-gdb-7.5-1.cfg
@@ -7,7 +7,8 @@
%define gdb_version 7.5
-Patch0: gdb-7.5-rtems4.11-20121003.diff
+Patch0: %{rtems_gdb_patches}/gdb-7.5-rtems4.11-20121003.diff
+%include rtems-gdb-patches.cfg
#
# The gdb build instructions. We use 7.xx Release 1.
diff --git a/rtems/config/tools/rtems-gdb-7.5.1-1.cfg b/rtems/config/tools/rtems-gdb-7.5.1-1.cfg
index 7cebe17..fee1f03 100644
--- a/rtems/config/tools/rtems-gdb-7.5.1-1.cfg
+++ b/rtems/config/tools/rtems-gdb-7.5.1-1.cfg
@@ -8,6 +8,11 @@
%define gdb_version 7.5.1
#
+# RTEMS Build Set patches.
+#
+%include rtems-gdb-patches.cfg
+
+#
# The gdb build instructions. We use 7.xx Release 1.
#
%include %{_configdir}/gdb-7-1.cfg
diff --git a/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg b/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg
index 936ad31..17b3021 100644
--- a/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg
+++ b/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg
@@ -14,7 +14,7 @@
# Source
#
Source0: http://www.rtems.org/ftp/pub/rtems/people/chrisj/nios/nios2-binutils-2.20.tar.bz2
-Patch0: nios2-binutils-2.20-rtems-20110703.diff
+Patch0: %{rtems_binutils_patches}/nios2/nios2-binutils-2.20-rtems-20110703.diff
#
# The binutils build instructions. We use 2.xx Release 1.
diff --git a/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg b/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg
index 3b94d02..0a43009 100644
--- a/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg
+++ b/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg
@@ -1,6 +1,8 @@
#
# RTEMS NIOS2 GCC 4.1., Newlib 1.19.0
#
+# This configuration has special support for the NIOS2.
+#
%include %{_configdir}/checks.cfg
%include %{_configdir}/base.cfg
@@ -16,13 +18,8 @@
#
# The RTEMS 4.11 patches
#
-Patch0: nios2-gcc-4.1-rtems-20110818.diff
-Patch10: nios2-newlib-1.19.0-rtems-20110720.diff
-
-#
-# Project custom message
-#
-%define gcc_version_message RTEMS %{rtems_version}-%{release},gcc-%{gcc_version}/newlib-%{newlib_version}
+Patch0: %{rtems_gcc_patches}/nios2/nios2-gcc-4.1-rtems-20110818.diff
+Patch10: %{rtems_newlib_patches}/nios2/nios2-newlib-1.19.0-rtems-20110720.diff
Name: %{_target}-gcc-%{gcc_version}-newlib-%{newlib_version}-%{release}
Summary: GCC v%{gcc_version} and Newlib v%{newlib_version} for target %{_target} on host %{_host}