summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-03-07 11:39:07 -0600
committerPatrick Williams <patrick@stwcx.xyz>2016-03-07 12:31:04 -0600
commit5e95bb193441d205782fd9d0b50d0fc1a8fced20 (patch)
treeb3b989e67d375a26267ea4f218722784fba19066
parent440c871d2fcdc5456befa9ace3e421ab0bde2237 (diff)
downloadtalos-openbmc-5e95bb193441d205782fd9d0b50d0fc1a8fced20.tar.gz
talos-openbmc-5e95bb193441d205782fd9d0b50d0fc1a8fced20.zip
Move glibc-cross-localedef patches from yocto-poky.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-rw-r--r--meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch (renamed from yocto-poky/meta/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch)0
-rw-r--r--meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend2
-rw-r--r--yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb1
3 files changed, 2 insertions, 1 deletions
diff --git a/yocto-poky/meta/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
index 5b8c240e3..5b8c240e3 100644
--- a/yocto-poky/meta/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
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 000000000..f065ed73f
--- /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_2.22.bb b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
index c7a9db7ac..2153ece0e 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 = "\
OpenPOWER on IntegriCloud