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.

30 files changed, 175 insertions, 57 deletions

diff --git a/rtems/config/4.11/rtems-arm.bset b/rtems/config/4.11/rtems-arm.bset
index 94ad8c5..811152b 100644
--- a/rtems/config/4.11/rtems-arm.bset
+++ b/rtems/config/4.11/rtems-arm.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS ARM 4.11 Stable
 #
 
-%define _target arm-rtems4.11
-
 %define release 1
 
+%define rtems_arch arm
+
 #
 # The RTEMS 4.11 base defines.
 #
@@ -19,7 +19,7 @@
 #
 # Patch to enable EABI
 #
-Patch2: gcc-4.7-arm-to-eabi-20120511.diff
+%define rtems_gcc_patch2 %{rtems_gcc_patches}/arm/gcc-4.7-arm-to-eabi-20120511.diff
 
 #
 # Tools configuration.
diff --git a/rtems/config/4.11/rtems-autotools.bset b/rtems/config/4.11/rtems-autotools.bset
index 219f43d..c3e9541 100644
--- a/rtems/config/4.11/rtems-autotools.bset
+++ b/rtems/config/4.11/rtems-autotools.bset
@@ -4,6 +4,8 @@
 
 %define release 1
 
+%define rtems_arch none
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-avr.bset b/rtems/config/4.11/rtems-avr.bset
index 32f685c..b79e8b6 100644
--- a/rtems/config/4.11/rtems-avr.bset
+++ b/rtems/config/4.11/rtems-avr.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS AVR 4.11 Stable
 #
 
-%define _target avr-rtems4.11
-
 %define release 1
 
+%define rtems_arch avr
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-bfin.bset b/rtems/config/4.11/rtems-bfin.bset
index 7dfb510..d7dc733 100644
--- a/rtems/config/4.11/rtems-bfin.bset
+++ b/rtems/config/4.11/rtems-bfin.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS BFIN 4.11 Stable
 #
 
-%define _target bfin-rtems4.11
-
 %define release 1
 
+%define rtems_arch bfin
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-h8300.bset b/rtems/config/4.11/rtems-h8300.bset
index 114d91a..95a5661 100644
--- a/rtems/config/4.11/rtems-h8300.bset
+++ b/rtems/config/4.11/rtems-h8300.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS H8300 4.11 Stable
 #
 
-%define _target h8300-rtems4.11
-
 %define release 1
 
+%define rtems_arch h8300
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-i386.bset b/rtems/config/4.11/rtems-i386.bset
index fb42577..7a736dc 100644
--- a/rtems/config/4.11/rtems-i386.bset
+++ b/rtems/config/4.11/rtems-i386.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS i386 4.11 Stable
 #
 
-%define _target i386-rtems4.11
-
 %define release 1
 
+%define rtems_arch i386
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-lm32.bset b/rtems/config/4.11/rtems-lm32.bset
index 75b819e..74307ec 100644
--- a/rtems/config/4.11/rtems-lm32.bset
+++ b/rtems/config/4.11/rtems-lm32.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS LM32 4.11 Stable
 #
 
-%define _target lm32-rtems4.11
-
 %define release 1
 
+%define rtems_arch lm32
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-m32c.bset b/rtems/config/4.11/rtems-m32c.bset
index 28f7886..4bcf96a 100644
--- a/rtems/config/4.11/rtems-m32c.bset
+++ b/rtems/config/4.11/rtems-m32c.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS M32C 4.11 Stable
 #
 
-%define _target m32c-rtems4.11
-
 %define release 1
 
+%define rtems_arch m32c
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-m32r.bset b/rtems/config/4.11/rtems-m32r.bset
index a7374c1..701138e 100644
--- a/rtems/config/4.11/rtems-m32r.bset
+++ b/rtems/config/4.11/rtems-m32r.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS M32R 4.11 Stable
 #
 
-%define _target m32r-rtems4.11
-
 %define release 1
 
+%define rtems_arch m32r
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-m68k.bset b/rtems/config/4.11/rtems-m68k.bset
index 4a573fe..aced92f 100644
--- a/rtems/config/4.11/rtems-m68k.bset
+++ b/rtems/config/4.11/rtems-m68k.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS M68K 4.11 Stable
 #
 
-%define _target m68k-rtems4.11
-
 %define release 1
 
+%define rtems_arch m68k
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-microblaze.bset b/rtems/config/4.11/rtems-microblaze.bset
index 16be6c1..3982b2e 100644
--- a/rtems/config/4.11/rtems-microblaze.bset
+++ b/rtems/config/4.11/rtems-microblaze.bset
@@ -2,19 +2,24 @@
 # Tools Set for RTEMS Microblaze 4.11 Stable
 #
 
-%define _target microblaze-rtems4.11
-
 %define release 1
 
+%define rtems_arch  microblaze
+
 #
 # The RTEMS 4.11 base defines.
 #
 %include rtems-4.11-base.bset
 
 #
+# GCC 4.7.2 Microblaze Patch
+#
+%define rtems_gcc_patch2 %{rtems_gcc_patches}/gcc/microblaze/gcc-4.7.2-microblaze-ldscript-2.diff
+
+#
 # Tools configuration.
 #
 expat-2.1.0-1
 tools/rtems-binutils-2.22-1
-tools/rtems-microblaze-gcc-4.7.2-newlib-2.0.0-1
+tools/rtems-gcc-4.7.2-newlib-2.0.0-1
 tools/rtems-gdb-7.5.1-1
diff --git a/rtems/config/4.11/rtems-mips.bset b/rtems/config/4.11/rtems-mips.bset
index be914dc..206a5d5 100644
--- a/rtems/config/4.11/rtems-mips.bset
+++ b/rtems/config/4.11/rtems-mips.bset
@@ -2,20 +2,26 @@
 # Tools Set for RTEMS MIPS 4.11 Stable
 #
 
-%define _target mips-rtems4.11
-
 %define release 1
 
+%define rtems_arch mips
+
 #
 # The RTEMS 4.11 base defines.
 #
 %include rtems-4.11-base.bset
 
 #
+# Newlib 2.0.0 Patches
+#
+%define rtems_gcc_patch12 %{rtems_newlib_patches}/mips/newlib-2.0.0-mips-memcpy-20130107.diff
+%define rtems_gcc_patch13 %{rtems_newlib_patches}/mips/newlib-2.0.0-mips-memcpy-20130219.diff
+
+#
 # Tools configuration.
 #
 expat-2.1.0-1
 tools/rtems-binutils-2.22-1
-tools/rtems-mips-gcc-4.7.2-newlib-2.0.0-1
+tools/rtems-gcc-4.7.2-newlib-2.0.0-1
 tools/rtems-gdb-7.5.1-1
 tools/rtems-mipstx39-gdb-7.5.1-1
diff --git a/rtems/config/4.11/rtems-moxie.bset b/rtems/config/4.11/rtems-moxie.bset
index d037bba..10eeb34 100644
--- a/rtems/config/4.11/rtems-moxie.bset
+++ b/rtems/config/4.11/rtems-moxie.bset
@@ -2,16 +2,21 @@
 # Tools Set for RTEMS Moxie 4.11 Stable
 #
 
-%define _target moxie-rtems4.11
-
 %define release 1
 
+%define rtems_arch moxie
+
 #
 # The RTEMS 4.11 base defines.
 #
 %include rtems-4.11-base.bset
 
 #
+# Moxie Binutils patches
+#
+%define rtems_bintutils_patch1 %{rtems_binutils_patches}/moxie/binutils-2.22-rtems4.11-moxie-20130214.diff
+
+#
 # Tools configuration.
 #
 expat-2.1.0-1
diff --git a/rtems/config/4.11/rtems-nios2.bset b/rtems/config/4.11/rtems-nios2.bset
index 75631c3..7a0ea51 100644
--- a/rtems/config/4.11/rtems-nios2.bset
+++ b/rtems/config/4.11/rtems-nios2.bset
@@ -4,13 +4,9 @@
 # The NIOS source is a special version released by Altera.
 #
 
-%define rtems_version 4.11
-
 %define release 1
 
-%define _target nios2-rtems%{rtems_version}
-
-package: rtems-%{rtems_version}-%{_target}-%{release}
+%define rtems_arch nios2
 
 #
 # The RTEMS 4.11 base defines.
diff --git a/rtems/config/4.11/rtems-sh.bset b/rtems/config/4.11/rtems-sh.bset
index cb4759e..e1040d3 100644
--- a/rtems/config/4.11/rtems-sh.bset
+++ b/rtems/config/4.11/rtems-sh.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS SH 4.11 Stable
 #
 
-%define _target sh-rtems4.11
-
 %define release 1
 
+%define rtems_arch sh
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset
index 06e8f06..f704824 100644
--- a/rtems/config/4.11/rtems-sparc.bset
+++ b/rtems/config/4.11/rtems-sparc.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS SPARC 4.11 Stable
 #
 
-%define _target sparc-rtems4.11
-
 %define release 1
 
+%define rtems_arch sparc
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-sparc64.bset b/rtems/config/4.11/rtems-sparc64.bset
index be594c5..90cddea 100644
--- a/rtems/config/4.11/rtems-sparc64.bset
+++ b/rtems/config/4.11/rtems-sparc64.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS SPARC64 4.11 Stable
 #
 
-%define _target sparc64-rtems4.11
-
 %define release 1
 
+%define rtems_arch sparc64
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/4.11/rtems-v850.bset b/rtems/config/4.11/rtems-v850.bset
index ef81e1b..e43c7a8 100644
--- a/rtems/config/4.11/rtems-v850.bset
+++ b/rtems/config/4.11/rtems-v850.bset
@@ -2,10 +2,10 @@
 # Tools Set for RTEMS V850 4.11 Stable
 #
 
-%define _target v850-rtems4.11
-
 %define release 1
 
+%define rtems_arch v850
+
 #
 # The RTEMS 4.11 base defines.
 #
diff --git a/rtems/config/rtems-4.11-base.bset b/rtems/config/rtems-4.11-base.bset
index fd999c2..be366a6 100644
--- a/rtems/config/rtems-4.11-base.bset
+++ b/rtems/config/rtems-4.11-base.bset
@@ -4,9 +4,27 @@
 
 %define rtems_version 4.11
 
+#
+# Define the build target.
+#
+%define _target %{rtems_arch}-rtems%{rtems_version}
+
+#
+# The generic package name.
+#
 package: rtems-%{rtems_version}-%{_target}-%{release}
 
 #
 # Project custom message
 #
-%define gcc_version_message RTEMS %{rtems_version} RSB-%{release},gcc-%{gcc_version}/newlib-%{newlib_version}
+%define gcc_version_message RTEMS %{rtems_version}-rsb-%{release},gcc-%{gcc_version}/newlib-%{newlib_version}
+
+#
+# The RTEMS http git URL.
+#
+%define rtems_http_git         http://git.rtems.org/rtems-tools.git/plain/tools/%{rtems_version}
+%define rtems_git_tools        %{rtems_http_git}/rtems-tools.git/plain/tools/%{rtems_version}
+%define rtems_binutils_patches %{rtems_git_tools}/binutils
+%define rtems_gcc_patches      %{rtems_git_tools}/gcc
+%define rtems_newlib_patches   %{rtems_git_tools}/newlib
+%define rtems_gdb_patches      %{rtems_git_tools}/gdb
diff --git a/rtems/config/rtems-binutils-patches.cfg b/rtems/config/rtems-binutils-patches.cfg
new file mode 100644
index 0000000..b9d85c2
--- /dev/null
+++ b/rtems/config/rtems-binutils-patches.cfg
@@ -0,0 +1,27 @@
+#
+# Manage RTEMS Binutils specific patches in the build sets
+#
+%if %{defined rtems_binutils_patch1}
+ Patch1: %{rtems_binutils_patch1}
+%endif
+%if %{defined rtems_binutils_patch2}
+ Patch2: %{rtems_binutils_patch2}
+%endif
+%if %{defined rtems_binutils_patch3}
+ Patch3: %{rtems_binutils_patch3}
+%endif
+%if %{defined rtems_binutils_patch4}
+ Patch4: %{rtems_binutils_patch4}
+%endif
+%if %{defined rtems_binutils_patch11}
+ Patch11: %{rtems_binutils_patch11}
+%endif
+%if %{defined rtems_binutils_patch12}
+ Patch12: %{rtems_binutils_patch12}
+%endif
+%if %{defined rtems_binutils_patch13}
+ Patch13: %{rtems_binutils_patch13}
+%endif
+%if %{defined rtems_binutils_patch14}
+ Patch14: %{rtems_binutils_patch14}
+%endif
diff --git a/rtems/config/rtems-gcc-patches.cfg b/rtems/config/rtems-gcc-patches.cfg
new file mode 100644
index 0000000..61d7774
--- /dev/null
+++ b/rtems/config/rtems-gcc-patches.cfg
@@ -0,0 +1,27 @@
+#
+# Manage RTEMS GCC/Newlib specific patches in the build sets
+#
+%if %{defined rtems_gcc_patch1}
+ Patch1: %{rtems_gcc_patch1}
+%endif
+%if %{defined rtems_gcc_patch2}
+ Patch2: %{rtems_gcc_patch2}
+%endif
+%if %{defined rtems_gcc_patch3}
+ Patch3: %{rtems_gcc_patch3}
+%endif
+%if %{defined rtems_gcc_patch4}
+ Patch4: %{rtems_gcc_patch4}
+%endif
+%if %{defined rtems_gcc_patch11}
+ Patch11: %{rtems_gcc_patch11}
+%endif
+%if %{defined rtems_gcc_patch12}
+ Patch12: %{rtems_gcc_patch12}
+%endif
+%if %{defined rtems_gcc_patch13}
+ Patch13: %{rtems_gcc_patch13}
+%endif
+%if %{defined rtems_gcc_patch14}
+ Patch14: %{rtems_gcc_patch14}
+%endif
diff --git a/rtems/config/rtems-gdb-patches.cfg b/rtems/config/rtems-gdb-patches.cfg
new file mode 100644
index 0000000..e6a72d8
--- /dev/null
+++ b/rtems/config/rtems-gdb-patches.cfg
@@ -0,0 +1,27 @@
+#
+# Manage RTEMS GDB specific patches in the build sets
+#
+%if %{defined rtems_gdb_patch1}
+ Patch1: %{rtems_gdb_patch1}
+%endif
+%if %{defined rtems_gdb_patch2}
+ Patch2: %{rtems_gdb_patch2}
+%endif
+%if %{defined rtems_gdb_patch3}
+ Patch3: %{rtems_gdb_patch3}
+%endif
+%if %{defined rtems_gdb_patch4}
+ Patch4: %{rtems_gdb_patch4}
+%endif
+%if %{defined rtems_gdb_patch11}
+ Patch11: %{rtems_gdb_patch11}
+%endif
+%if %{defined rtems_gdb_patch12}
+ Patch12: %{rtems_gdb_patch12}
+%endif
+%if %{defined rtems_gdb_patch13}
+ Patch13: %{rtems_gdb_patch13}
+%endif
+%if %{defined rtems_gdb_patch14}
+ Patch14: %{rtems_gdb_patch14}
+%endif
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}