4 files changed, 8 insertions, 2 deletions

diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3-2.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3-2.bb
new file mode 100644
index 0000000000..1639511362
--- /dev/null
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3-2.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3/gcc-3.4.4-makefile-fix.patch b/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3-2/gcc-3.4.4-makefile-fix.patch
index 74c1f26833..74c1f26833 100644
--- a/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3/gcc-3.4.4-makefile-fix.patch
+++ b/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3-2/gcc-3.4.4-makefile-fix.patch
diff --git a/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb b/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb
new file mode 100644
index 0000000000..cf1542d1e7
--- /dev/null
+++ b/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb
@@ -0,0 +1,5 @@
+require gcc-cross-initial_${PV}.bb
+require gcc-cross-kernel.inc
+
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb b/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb
index d14419191c..f95e2e1177 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb
@@ -1,11 +1,10 @@
-require gcc_csl-arm-2005q3.bb
+require gcc_csl-arm-2005q3-2.bb
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
 PR = "r0"
-PV = "3.4.4+csl-arm-2005q3-2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"