mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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. (From OE-Core rev: 39840ed10af559bbcc306b378baa4723921668f5) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user