Skip to contentSkip to conversation

glibc-locale: Rewrite do_install using install utility instead of cp

PATCH New Khem Raj 1 participant 1 message Feb 7, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 glibc-locale: Rewrite do_install using install utility instead of cp

This has been a constant source of trouble for build failures due to host-user-contaminated QA errors of sort

ERROR: QA Issue: glibc-locale: /glibc-binary-localedata-ca-es+valencia/usr/lib/locale/ca_ES@valencia/LC_MONETARY is owned by uid 3004, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

So far we have tried to mould cp command into not carrying the build user permissions into install area but it is never entirely fixed since the issue keeps popping up in various scenes

This patch replaces use of cp with install utility and specifies install mode for files explcitly

---
v2: Turn the common install loop into a shell function ( Thanks Peter Kjellerstedt)

 meta/recipes-core/glibc/glibc-locale.inc | 43 ++++++++++++------------
 1 file changed, 21 insertions(+), 22 deletions(-)
meta/recipes-core/glibc/glibc-locale.inc +21 -22
index 6384f9cbf1..c51fa482a9 100644
@@ -71,28 +71,27 @@ FILES_localedef = "${bindir}/localedef"
 
 LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
 
-do_install () {
-	mkdir -p ${D}${bindir} ${D}${datadir}
-	if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
-		cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
-	fi
-	if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then
-		mkdir -p ${D}${localedir}
-		cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
-	fi
-	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}
-	fi
-	cp -R --no-dereference --preserve=mode,links ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
+copy_locale_files() {
+        local dir=$1 mode=$2
+
+        [ -e "${LOCALETREESRC}$dir" ] || return 0
+
+        for d in . $(find "${LOCALETREESRC}$dir" -type d -printf '%P '); do
+                install -d ${D}$dir/$d
+                find "${LOCALETREESRC}$dir/$d" -maxdepth 1 -type f \
+                     -exec install -m $mode -t "${D}$dir/$d" {} \;
+        done
+}
+
+do_install() {
+        copy_locale_files ${bindir} 0755
+        copy_locale_files ${localedir} 0644
+        if [ ${PACKAGE_NO_GCONV} -eq 0 ]; then
+                copy_locale_files ${libdir}/gconv 0755
+                copy_locale_files ${datadir}/i18n 0644
+        fi
+        copy_locale_files ${datadir}/locale 0644
+        install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED
 }
 
 inherit libc-package
Signature · 1 line
2.20.1