diff options
| author |   Jason Wessel <jason.wessel@windriver.com> | 2019-07-02 13:16:08 -0700 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2019-09-04 08:22:03 -0700 |
| commit | f7a581264d0f73f0951253a887e380326ffd6180 (patch) | |
| tree | 2e249e8cb807bbf29af95b51cbdb3c2be9c064e0 | |
| parent | 273571804567a4520f1e17f5f8a28b85325d0eb2 (diff) | |
| download | openembedded-core-f7a581264d0f73f0951253a887e380326ffd6180.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.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -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 a985d26c75..17f5b781f4 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc @@ -89,6 +89,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 copy_locale_files ${datadir}/locale 0644 install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED |