summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2022-09-28 22:06:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-29 21:13:36 +0100
commitb2565de1d9fb513c61f80a4f02be39ee9c31e7dd (patch)
treedbaa01623e10a8dcf6c3cca6a897d781bbdecede
parent6d9364e5f3535954f65cbbc694ee7933ac1d664f (diff)
downloadopenembedded-core-b2565de1d9fb513c61f80a4f02be39ee9c31e7dd.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.36-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.36-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>
-rw-r--r--meta/recipes-core/glibc/glibc-locale.inc5
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
}