diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2019-07-02 13:16:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-03 17:00:57 +0100 |
commit | 92ffcf998599a8b2408d90503ffbfbff6979fd43 (patch) | |
tree | 4a457e8f0cd4d789f905699c979380f7d5ec97c2 /meta | |
parent | 52971eeaaf0adcf859ab04853e9ab2e551e4998f (diff) | |
download | poky-92ffcf998599a8b2408d90503ffbfbff6979fd43.tar.gz |
glibc-locale: Fix build error with PACKAGE_NO_GCONV = "1"
When the PACKAGE_NO_GCONV is set to 1 an empty directory is left behind from the do_install rule:
=====
ERROR: glibc-locale-2.29-r0 do_package: QA Issue: glibc-locale: Files/directories were installed but not shipped in any package:
/usr/lib
/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: 2 installed and not shipped files. [installed-vs-shipped]
ERROR: glibc-locale-2.29-r0 do_package: Fatal QA errors found, failing task.
=====
The simple fix is to prune the empty directory.
(From OE-Core rev: 4b3c5ec80e696fc2c7ce7ceba118095f9b8f6439)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/glibc/glibc-locale.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index f033635bd0..bf5eaee938 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc | |||
@@ -87,6 +87,9 @@ do_install() { | |||
87 | if [ ${PACKAGE_NO_GCONV} -eq 0 ]; then | 87 | if [ ${PACKAGE_NO_GCONV} -eq 0 ]; then |
88 | copy_locale_files ${libdir}/gconv 0755 | 88 | copy_locale_files ${libdir}/gconv 0755 |
89 | copy_locale_files ${datadir}/i18n 0644 | 89 | copy_locale_files ${datadir}/i18n 0644 |
90 | else | ||
91 | # Remove the libdir if it is empty when gconv is not copied | ||
92 | find ${D}${libdir} -type d -empty -delete | ||
90 | fi | 93 | fi |
91 | copy_locale_files ${datadir}/locale 0644 | 94 | copy_locale_files ${datadir}/locale 0644 |
92 | install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED | 95 | install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED |