diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2019-07-02 13:16:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-30 16:44:42 +0100 |
commit | c887c1b217238c71c90c9433cd6928b14498d5fb (patch) | |
tree | b36d485236fead30c7626439e25e4bfba024911a /meta | |
parent | e973b8d7e289e2b6f10d8e553fa6bb71cf5fd4f4 (diff) | |
download | poky-c887c1b217238c71c90c9433cd6928b14498d5fb.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: f7a581264d0f73f0951253a887e380326ffd6180)
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>
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 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() { | |||
89 | if [ ${PACKAGE_NO_GCONV} -eq 0 ]; then | 89 | if [ ${PACKAGE_NO_GCONV} -eq 0 ]; then |
90 | copy_locale_files ${libdir}/gconv 0755 | 90 | copy_locale_files ${libdir}/gconv 0755 |
91 | copy_locale_files ${datadir}/i18n 0644 | 91 | copy_locale_files ${datadir}/i18n 0644 |
92 | else | ||
93 | # Remove the libdir if it is empty when gconv is not copied | ||
94 | find ${D}${libdir} -type d -empty -delete | ||
92 | fi | 95 | fi |
93 | copy_locale_files ${datadir}/locale 0644 | 96 | copy_locale_files ${datadir}/locale 0644 |
94 | install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED | 97 | install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED |