summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-07-21 09:27:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 12:44:35 +0100
commit418b9261b3688dc03d73058c696dd4405a0b34f5 (patch)
tree1d229920a51989289f60f9f205bad88e5ed41bef /meta
parent4fb55aaaf70bb4911342e5ace7fb978f7e298233 (diff)
downloadpoky-418b9261b3688dc03d73058c696dd4405a0b34f5.tar.gz
glibc-locale: Fix host-user-contaminated QA errors
Fixes ERROR: glibc-locale-2.27-r0 do_package_qa: QA Issue: glibc-locale: /glibc-binary-localedata-hy-am/usr/lib/locale/hy_AM/LC_MEASUREMENT.tmp is owned by uid 3004, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] (From OE-Core rev: 06d831d12fe2a2366480c79f4c018942937b753a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glibc/glibc-locale.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
index b3cb10b87a..e50e5cf5e3 100644
--- a/meta/recipes-core/glibc/glibc-locale.inc
+++ b/meta/recipes-core/glibc/glibc-locale.inc
@@ -74,23 +74,22 @@ LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
74do_install () { 74do_install () {
75 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} 75 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
76 if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then 76 if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
77 cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} 77 cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
78 fi 78 fi
79 if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then 79 if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then
80 mkdir -p ${D}${localedir} 80 mkdir -p ${D}${localedir}
81 cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir} 81 cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
82 fi 82 fi
83 if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then 83 if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
84 cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} 84 cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
85 fi 85 fi
86 if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then 86 if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then
87 cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} 87 cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
88 fi 88 fi
89 if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then 89 if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then
90 cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} 90 cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}
91 fi 91 fi
92 chown root:root -R ${D} 92 cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
93 cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
94} 93}
95 94
96inherit libc-package 95inherit libc-package