From 2dccb370e04bc2bbe208b2b0541077d8ef519535 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 29 Jun 2011 13:35:00 +0100 Subject: glibc/eglibc: Clean up package warnings and potentially broken data in -dev package These changes ensure files packaged in the -locale package aren't included in the main do_install and also ensures the staging directory used for the -locale package doesn't end up in the -dev package. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'meta/recipes-core/glibc/glibc-package.inc') diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 5373d56d57..c1c38534b7 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -74,3 +74,23 @@ EXTRA_OEMAKE += "rootsbindir=${base_sbindir}" inherit libc-common +do_install_locale () { + dest=${D}/${includedir}/glibc-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} + cp -fpPR ${WORKDIR}/SUPPORTED ${dest} +} + +addtask do_install_locale after do_install before do_populate_sysroot + +PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess" + +glibc_package_preprocess () { + rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} +} + -- cgit 1.2.3-korg