MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

glibc-package: Avoid race sstate races with do_stash_locale

Browse Source 
The change to make do_stash_locale an sstate task between do_install and
do_package has some unforeseen problems since the function deletes part of
${D} but may or may not run depending on whether the task is installed from
sstate.

This cleans up the current "pre packaging" function to be more deterministic
and result in the same set of files, whichever code path we end up reaching
that point by. Its not an ideal sitation but it should avoid the race
failures we've seen on some builds.

(From OE-Core rev: 2a60bba00da9c4e2b1a1ce30e509dba82cc6c94a)

(From OE-Core rev: 9660e4d75230a8aed91a2fc4c887e332f52914e2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2017-02-08 12:29:04 +00:00
parent 39ce1d5659
commit 05696923f6
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta/recipes-core/glibc/glibc-package.inc
View File

@ -192,18 +192,23 @@ python do_stash_locale_setscene () {
}
addtask do_stash_locale_setscene
PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess"
glibc_package_preprocess () {
do_poststash_install_cleanup () {
# Remove all files which do_stash_locale would remove (mv)
# since that task could have come from sstate and not get run.
for i in ${bashscripts}; do
rm -f ${PKGD}${bindir}/$i
rm -f ${D}${bindir}/$i
done
rm -rf ${PKGD}/${localedir}
rm -f ${D}${bindir}/localedef
rm -rf ${D}${datadir}/i18n
rm -rf ${D}${libdir}/gconv
rm -rf ${D}/${localedir}
rm -rf ${D}${datadir}/locale
if [ "${libdir}" != "${exec_prefix}/lib" ]; then
# This dir only exists to hold locales
rm -rf ${PKGD}${exec_prefix}/lib
rm -rf ${D}${exec_prefix}/lib
fi
}
addtask do_poststash_install_cleanup after do_stash_locale do_install before do_populate_sysroot do_package
pkg_postinst_nscd () {
if [ -z "$D" ]; then