diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-30 16:34:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-15 13:45:49 +0100 |
| commit | 2af64401a7fe081d6ac4061f7542b32bac0f18b4 (patch) | |
| tree | 8e95aeb7e901d87d4c490ac3ebbadb5e6cbb7941 /meta/recipes-core | |
| parent | 54066582a04bd6955896f80ad6a7452b4a6cf117 (diff) | |
| download | poky-2af64401a7fe081d6ac4061f7542b32bac0f18b4.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.
(From OE-Core rev: 7325222ce0dc8a75bc2d3eb7b6049f0d995ce17f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f18817f5340d06f7b4bb846a83b48731a1b9c4bc)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 1 |
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 () { | |||
| 192 | fi | 192 | fi |
| 193 | 193 | ||
| 194 | cp -fpPR ${D}${datadir}/* $dest${datadir} | 194 | cp -fpPR ${D}${datadir}/* $dest${datadir} |
| 195 | rm -rf ${D}${datadir}/locale/ | ||
| 196 | cp -fpPR ${WORKDIR}/SUPPORTED $dest | 195 | cp -fpPR ${WORKDIR}/SUPPORTED $dest |
| 197 | 196 | ||
| 198 | target=$dest/scripts | 197 | target=$dest/scripts |