summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-12-05 08:00:54 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 22:30:15 +0000
commit39840ed10af559bbcc306b378baa4723921668f5 (patch)
treeee03eb4164ed232d6f9c8a45fa30d40f0594537d /meta/recipes-core/glibc
parent1eaa918ae3663e3f863c025744a9ced0300b6b78 (diff)
downloadopenembedded-core-contrib-39840ed10af559bbcc306b378baa4723921668f5.tar.gz
openembedded-core-contrib-39840ed10af559bbcc306b378baa4723921668f5.tar.bz2
openembedded-core-contrib-39840ed10af559bbcc306b378baa4723921668f5.zip
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 <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r--meta/recipes-core/glibc/glibc-locale.inc15
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
index 57b465dd5d..6384f9cbf1 100644
--- a/meta/recipes-core/glibc/glibc-locale.inc
+++ b/meta/recipes-core/glibc/glibc-locale.inc
@@ -72,7 +72,7 @@ FILES_localedef = "${bindir}/localedef"
LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
do_install () {
- mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
+ mkdir -p ${D}${bindir} ${D}${datadir}
if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
fi
@@ -80,11 +80,14 @@ do_install () {
mkdir -p ${D}${localedir}
cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
fi
- if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
- cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
- fi
- if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then
- cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
+ if [ ${@d.getVar('PACKAGE_NO_GCONV')} -eq 0 ]; then
+ mkdir -p ${D}${libdir}
+ if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
+ cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
+ fi
+ if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then
+ cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
+ fi
fi
if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then
cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}