From: Jason Wessel Date: Tue, 2 Jul 2019 20:16:08 +0000 (-0700) Subject: glibc-locale: Fix build error with PACKAGE_NO_GCONV = "1" X-Git-Tag: 2019-04.2-warrior~47 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f7a581264d0f73f0951253a887e380326ffd6180;p=openembedded-core.git 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 Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- 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