summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-30 16:34:08 +0100
committerSteve Sakoman <steve@sakoman.com>2020-10-07 13:32:41 -1000
commit7325222ce0dc8a75bc2d3eb7b6049f0d995ce17f (patch)
treec2eb5532dd85b6e6c574486a08da0626aa5b3e18
parentf99dc4e49d4ad4383c826dd8f8410c32f408e9bd (diff)
downloadopenembedded-core-contrib-7325222ce0dc8a75bc2d3eb7b6049f0d995ce17f.tar.gz
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 <richard.purdie@linuxfoundation.org> (cherry picked from commit f18817f5340d06f7b4bb846a83b48731a1b9c4bc) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc1
1 files changed, 0 insertions, 1 deletions
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