diff options
| author |   Denys Dmytriyenko <denis@denix.org> | 2022-09-30 03:20:44 +0000 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-09-30 09:35:23 -1000 |
| commit | 46b703dbbddf612f70d9fd402b8538fca9c757e4 (patch) | |
| tree | 27a7fbd6a57468e7264fc36bf502a4629fcceda9 /meta/recipes-core | |
| parent | b1883d725e2ee833b6bcbc2036df8c8287bed547 (diff) | |
| download | openembedded-core-contrib-46b703dbbddf612f70d9fd402b8538fca9c757e4.tar.gz | |
glibc-locale: explicitly remove empty dirs in ${libdir}
glibc-locale defaults to ENABLE_BINARY_LOCALE_GENERATION ?= "0", but gets
changed to "1" in the default-distrovars.inc
When it is explicitly set back to "0", it fails with this error:
ERROR: glibc-locale-2.35-r0 do_package: QA Issue: glibc-locale: Files/directories were installed but not shipped in any package:
/usr/lib/locale
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
glibc-locale: 1 installed and not shipped files. [installed-vs-shipped]
ERROR: glibc-locale-2.35-r0 do_package: Fatal QA errors were found, failing task.
There's a code to remove empty dirs in ${libdir}, but it's keyed off of
PACKAGE_NO_GCONV to clean up $[libdir]/gconv, just extend it to also cover
other empty dirs, including ${libdir}/locale.
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-locale.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index b8de7d3192..7c14abfe99 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc @@ -87,10 +87,9 @@ do_install() { if [ ${PACKAGE_NO_GCONV} -eq 0 ]; then copy_locale_files ${libdir}/gconv 0755 copy_locale_files ${datadir}/i18n 0644 - else - # Remove the libdir if it is empty when gconv is not copied - find ${D}${libdir} -type d -empty -delete fi + # Remove empty dirs in libdir when gconv or locales are not copied + find ${D}${libdir} -type d -empty -delete copy_locale_files ${datadir}/locale 0644 install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED } |