From 5d75eb27398ba65de8510c4be53c51966d4548be Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Sun, 28 Aug 2011 21:43:31 +0100
Subject: [PATCH] binutils: update to 2.21.1a

2.21.1 has disappeared upstream. There is no ChangeLog information for
2.21.1a, however diff reports only the addition of some cpu/opc files in
cgen/ subdirectory; the source code is otherwise identical.

(From OE-Core rev: 4ecf379aba11983b66be4fbe26e65aa28740ddfd)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...dian_2.21.1.bb => binutils-cross-canadian_2.21.1a.bb} | 0
 ...inutils-cross_2.21.1.bb => binutils-cross_2.21.1a.bb} | 0
 ...s-crosssdk_2.21.1.bb => binutils-crosssdk_2.21.1a.bb} | 0
 .../binutils/{binutils_2.21.1.bb => binutils_2.21.1a.bb} | 9 ++++++---
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.21.1.bb => binutils-cross-canadian_2.21.1a.bb} (100%)
 rename meta/recipes-devtools/binutils/{binutils-cross_2.21.1.bb => binutils-cross_2.21.1a.bb} (100%)
 rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.21.1.bb => binutils-crosssdk_2.21.1a.bb} (100%)
 rename meta/recipes-devtools/binutils/{binutils_2.21.1.bb => binutils_2.21.1a.bb} (85%)

diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1a.bb
similarity index 100%
rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1.bb
rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1a.bb
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.21.1.bb b/meta/recipes-devtools/binutils/binutils-cross_2.21.1a.bb
similarity index 100%
rename from meta/recipes-devtools/binutils/binutils-cross_2.21.1.bb
rename to meta/recipes-devtools/binutils/binutils-cross_2.21.1a.bb
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1a.bb
similarity index 100%
rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1.bb
rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1a.bb
diff --git a/meta/recipes-devtools/binutils/binutils_2.21.1.bb b/meta/recipes-devtools/binutils/binutils_2.21.1a.bb
similarity index 85%
rename from meta/recipes-devtools/binutils/binutils_2.21.1.bb
rename to meta/recipes-devtools/binutils/binutils_2.21.1a.bb
index 96f9d5fec3..2d4ed2764a 100644
--- a/meta/recipes-devtools/binutils/binutils_2.21.1.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.21.1a.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-PR = "r4"
+PR = "r0"
 
 LIC_FILES_CHKSUM="\
     file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
@@ -33,7 +33,10 @@ SRC_URI = "\
      file://binutils-powerpc-e5500.patch \
      "
 
-SRC_URI[md5sum] = "a22801a9cad45c85e9ff6afc10537d72"
-SRC_URI[sha256sum] = "f769b64350a02fbee009e1582cc12b6ed43b41985de65effb741e258e075dd05"
+SRC_URI[md5sum] = "bde820eac53fa3a8d8696667418557ad"
+SRC_URI[sha256sum] = "cdecfa69f02aa7b05fbcdf678e33137151f361313b2f3e48aba925f64eabf654"
+
+# 2.21.1a has a mismatched dir name within the tarball
+S = "${WORKDIR}/binutils-2.21.1"
 
 BBCLASSEXTEND = "native"