diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 13:35:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 14:28:03 +0100 |
commit | 8bdb4de37cf543c96e5ed582038deb4be2987474 (patch) | |
tree | 00e1e734eb714e3f047b2291f4ebb5e724680183 /meta/recipes-core/glibc/glibc-package.inc | |
parent | 0401f4195875cf1aee390a23c832758a99871cb2 (diff) | |
download | poky-8bdb4de37cf543c96e5ed582038deb4be2987474.tar.gz |
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.
(From OE-Core rev: 2dccb370e04bc2bbe208b2b0541077d8ef519535)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc-package.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 20 |
1 files changed, 20 insertions, 0 deletions
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}" | |||
74 | 74 | ||
75 | inherit libc-common | 75 | inherit libc-common |
76 | 76 | ||
77 | do_install_locale () { | ||
78 | dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS} | ||
79 | install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} | ||
80 | cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} | ||
81 | cp -fpP ${D}${bindir}/localedef ${dest}${bindir} | ||
82 | mv ${D}${libdir}/gconv ${dest}${libdir} | ||
83 | cp -fpPR ${D}${libdir}/* ${dest}${libdir} | ||
84 | mv ${D}${datadir}/i18n ${dest}${datadir} | ||
85 | cp -fpPR ${D}${datadir}/* ${dest}${datadir} | ||
86 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} | ||
87 | } | ||
88 | |||
89 | addtask do_install_locale after do_install before do_populate_sysroot | ||
90 | |||
91 | PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess" | ||
92 | |||
93 | glibc_package_preprocess () { | ||
94 | rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} | ||
95 | } | ||
96 | |||