2 files changed, 6 insertions, 14 deletions

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index c84f03292b..00cccc0175 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r2"
+PR = "r16"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 831835612e..8228484815 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -90,21 +90,13 @@ inherit libc-common
 
 do_install_locale () {
         dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
-        install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
-        cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
-        cp -fpP ${D}${bindir}/localedef ${dest}${bindir}
-        mv ${D}${libdir}/gconv ${dest}${libdir}
-        cp -fpPR ${D}${libdir}/* ${dest}${libdir}
-        mv ${D}${datadir}/i18n ${dest}${datadir}
-        cp -fpPR ${D}${datadir}/* ${dest}${datadir}
+        install -d ${dest} ${dest}${bindir}
+        cp -fpPR ${D}${base_libdir} ${dest}${base_prefix}
+        cp -fpPR ${D}${libdir} ${dest}${exec_prefix}
+        cp -fpPR ${D}${datadir} ${dest}${exec_prefix}
+        cp -fpPR ${D}${bindir}/localedef ${dest}${bindir}
         cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
 }
 
 addtask do_install_locale after do_install before do_populate_sysroot
 
-PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
-
-eglibc_package_preprocess () {
-        rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
-}
-