From 39840ed10af559bbcc306b378baa4723921668f5 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 5 Dec 2018 08:00:54 -0500 Subject: glibc-locale: fix installed-vs-shipped qa issue Variable PACKAGE_NO_GCONV is set in libc-package.bbclass when none of libc-charsets, libc-locales and libc-locale-code set in DISTRO_FEATURES. Then it causes installed-vs-shipped qa issue of glibc-locale: | ERROR: glibc-locale-2.28-r0 do_package: QA Issue: glibc-locale: | Files/directories were installed but not shipped in any package: | /usr/share/i18n | /usr/share/i18n/charmaps | /usr/share/i18n/locales | /usr/share/i18n/charmaps/CP737.gz | ... | /usr/share/i18n/locales/ru_RU | ... | /usr/lib64/gconv/gconv-modules | 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: 843 installed and not shipped files. [installed-vs-shipped] So check PACKAGE_NO_GCONV during do_install and not copy those files if PACKAGE_NO_GCONV has been set. Simplify call of bb.utils.contains() in libc-package.bbclass as well. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- meta/classes/libc-package.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/classes/libc-package.bbclass') diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 6b1e84ef7e..82d642e15e 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -39,9 +39,7 @@ python __anonymous () { break # try to fix disable charsets/locales/locale-code compile fail - if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) and \ - bb.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) and \ - bb.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d): + if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locales libc-locale-code', True, False, d): d.setVar('PACKAGE_NO_GCONV', '0') else: d.setVar('PACKAGE_NO_GCONV', '1') -- cgit 1.2.3-korg