[PATCH openbmc 2/2] Move glibc-cross-localedef patches from yocto-poky.

[OpenBMC Patches]

From: Patrick Williams <patrick at stwcx.xyz>

Signed-off-by: Patrick Williams <patrick at stwcx.xyz>
---
 .../0001-add-support-for-Power8-LE-mode.patch      | 26 ++++++++++++++++++++++
 .../glibc/cross-localedef-native_2.22.bbappend     |  2 ++
 .../0001-add-support-for-Power8-LE-mode.patch      | 26 ----------------------
 .../glibc/cross-localedef-native_2.22.bb           |  1 -
 4 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
 create mode 100644 meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend
 delete mode 100644 yocto-poky/meta/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch

diff --git a/meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
new file mode 100644
index 0000000..5b8c240
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
@@ -0,0 +1,26 @@
+From bc89a1d5329cf8f8a67a5e8c2b7ed53aa6611183 Mon Sep 17 00:00:00 2001
+From: Chris Austen <austenc at us.ibm.com>
+Date: Thu, 24 Sep 2015 14:49:24 -0500
+Subject: [PATCH 1/1] add support for Power8 LE mode
+
+---
+ config.guess | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/localedef/config.guess b/localedef/config.guess
+index 61f2e4c..c77ec22 100644
+--- a/localedef/config.guess
++++ b/localedef/config.guess
+@@ -876,6 +876,9 @@ EOF
+     ppc64:Linux:*:*)
+ 	echo powerpc64-unknown-linux-gnu
+ 	exit 0 ;;
++    ppc64le:Linux:*:*)
++       echo powerpc64le-unknown-linux-gnu
++       exit 0 ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-- 
+1.9.1
+
diff --git a/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend
new file mode 100644
index 0000000..f065ed7
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend
@@ -0,0 +1,2 @@
+SRC_URI += "file://0001-add-support-for-Power8-LE-mode.patch"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/yocto-poky/meta/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
deleted file mode 100644
index 5b8c240..0000000
--- a/yocto-poky/meta/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From bc89a1d5329cf8f8a67a5e8c2b7ed53aa6611183 Mon Sep 17 00:00:00 2001
-From: Chris Austen <austenc at us.ibm.com>
-Date: Thu, 24 Sep 2015 14:49:24 -0500
-Subject: [PATCH 1/1] add support for Power8 LE mode
-
----
- config.guess | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/localedef/config.guess b/localedef/config.guess
-index 61f2e4c..c77ec22 100644
---- a/localedef/config.guess
-+++ b/localedef/config.guess
-@@ -876,6 +876,9 @@ EOF
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
- 	exit 0 ;;
-+    ppc64le:Linux:*:*)
-+       echo powerpc64le-unknown-linux-gnu
-+       exit 0 ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
--- 
-1.9.1
-
diff --git a/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
index c7a9db7..2153ece 100644
--- a/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
+++ b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
@@ -20,7 +20,6 @@ GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
 SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \
            git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \
            file://fix_for_centos_5.8.patch \
-           file://0001-add-support-for-Power8-LE-mode.patch \
            ${EGLIBCPATCHES} \
 "
 EGLIBCPATCHES = "\
-- 
2.7.1