summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc17
1 files changed, 11 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index b8239e0f02..6f4e71d1de 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -192,18 +192,23 @@ python do_stash_locale_setscene () {
192} 192}
193addtask do_stash_locale_setscene 193addtask do_stash_locale_setscene
194 194
195PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess" 195do_poststash_install_cleanup () {
196 196 # Remove all files which do_stash_locale would remove (mv)
197glibc_package_preprocess () { 197 # since that task could have come from sstate and not get run.
198 for i in ${bashscripts}; do 198 for i in ${bashscripts}; do
199 rm -f ${PKGD}${bindir}/$i 199 rm -f ${D}${bindir}/$i
200 done 200 done
201 rm -rf ${PKGD}/${localedir} 201 rm -f ${D}${bindir}/localedef
202 rm -rf ${D}${datadir}/i18n
203 rm -rf ${D}${libdir}/gconv
204 rm -rf ${D}/${localedir}
205 rm -rf ${D}${datadir}/locale
202 if [ "${libdir}" != "${exec_prefix}/lib" ]; then 206 if [ "${libdir}" != "${exec_prefix}/lib" ]; then
203 # This dir only exists to hold locales 207 # This dir only exists to hold locales
204 rm -rf ${PKGD}${exec_prefix}/lib 208 rm -rf ${D}${exec_prefix}/lib
205 fi 209 fi
206} 210}
211addtask do_poststash_install_cleanup after do_stash_locale do_install before do_populate_sysroot do_package
207 212
208pkg_postinst_nscd () { 213pkg_postinst_nscd () {
209 if [ -z "$D" ]; then 214 if [ -z "$D" ]; then