From: Richard Purdie Date: Wed, 30 Sep 2020 15:34:08 +0000 (+0100) Subject: glibc: do_stash_locale must not delete files from ${D} X-Git-Tag: 2020-04.4-dunfell~106 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7325222ce0dc8a75bc2d3eb7b6049f0d995ce17f;p=openembedded-core.git glibc: do_stash_locale must not delete files from ${D} do_stash_locale doesn't run in fakeroot context, do_install does. We therefore shouldn't delete files that do_install has added or it leaves potentially problemtic entries in the fakeroot database. Leaving the files around doesn't change or break anything else. Signed-off-by: Richard Purdie (cherry picked from commit f18817f5340d06f7b4bb846a83b48731a1b9c4bc) Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 285a9aa2f5..7854f2a156 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -192,7 +192,6 @@ do_stash_locale () { fi cp -fpPR ${D}${datadir}/* $dest${datadir} - rm -rf ${D}${datadir}/locale/ cp -fpPR ${WORKDIR}/SUPPORTED $dest target=$dest/scripts