From 06d831d12fe2a2366480c79f4c018942937b753a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 21 Jul 2018 09:27:09 -0700 Subject: 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] Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- meta/recipes-core/glibc/glibc-locale.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'meta/recipes-core/glibc') 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" do_install () { mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then - cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${bindir}/* ${D}${bindir} fi if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then mkdir -p ${D}${localedir} - cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${localedir}/* ${D}${localedir} fi if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then - cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} fi if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then - cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} fi if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then - cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} fi - chown root:root -R ${D} - cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR} + cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/SUPPORTED ${WORKDIR} } inherit libc-package -- cgit 1.2.3-korg