libc-locale: split locale handling from libc recipe.

*libc's do_package will cost a lot of time due to the locale handing,
which may delay the other recipe's do_package task and affect the build
performance.

This commit moves locale handling into a separate recipe *libc-locale.

[RP: Add fixup with recent eglibc commit conflict for FILES_pn-dbg and PACKAGES]
(From OE-Core rev: c6d3242f7642f537b02870bb4eb650f0e2094b85)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 23 insertions, 24 deletions

diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
new file mode 100644
index 0000000000..bae0ace890
--- /dev/null
+++ b/meta/classes/libc-common.bbclass
@@ -0,0 +1,23 @@
+do_install() {
+        oe_runmake install_root=${D} install
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
+        done
+        install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
+        install -d ${D}${libdir}/locale
+        make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
+        # get rid of some broken files...
+        for i in ${GLIBC_BROKEN_LOCALES}; do
+                grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
+                mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
+        done
+        rm -f ${D}{sysconfdir}/rpc
+        rm -rf ${D}${datadir}/zoneinfo
+        rm -rf ${D}${libexecdir}/getconf
+}
+
+def get_libc_fpu_setting(bb, d):
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+        return "--without-fp"
+    return ""
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 55e3d48532..5737af4dfc 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -37,11 +37,6 @@ python __anonymous () {
                 break
 }
 
-def get_libc_fpu_setting(bb, d):
-    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-        return "--without-fp"
-    return ""
-
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 
 do_configure_prepend() {
@@ -84,25 +79,6 @@ rm -rf ${TMP_LOCALE}
 }
 
 
-do_install() {
-        oe_runmake install_root=${D} install
-        for r in ${rpcsvc}; do
-                h=`echo $r|sed -e's,\.x$,.h,'`
-                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
-        done
-        install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
-        install -d ${D}${libdir}/locale
-        make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
-        # get rid of some broken files...
-        for i in ${GLIBC_BROKEN_LOCALES}; do
-                grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
-                mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
-        done
-        rm -f ${D}${sysconfdir}/rpc
-        rm -rf ${D}${datadir}/zoneinfo
-        rm -rf ${D}${libexecdir}/getconf
-}
-
 TMP_LOCALE="/tmp/locale${libdir}/locale"
 
 do_prep_locale_tree() {