]> code.ossystems Code Review - openembedded-core.git/commitdiff
glibc: do_stash_locale must not delete files from ${D}
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 30 Sep 2020 15:34:08 +0000 (16:34 +0100)
committerSteve Sakoman <steve@sakoman.com>
Wed, 7 Oct 2020 23:32:41 +0000 (13:32 -1000)
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 <richard.purdie@linuxfoundation.org>
(cherry picked from commit f18817f5340d06f7b4bb846a83b48731a1b9c4bc)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-core/glibc/glibc-package.inc

index 285a9aa2f545a0332ec1f91f2704a5cfe6eda76c..7854f2a15636ee2052883fac28455d125012bbcf 100644 (file)
@@ -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