From 55fb2d1b25482f661242814532672b8f820b3b06 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Tue, 13 Oct 2015 15:37:13 +0200 Subject: webmin: fix QA host-user-contaminated Due to the way most files were installed, using cp ..., during packaging we got spammed with messages like: WARNING: QA Issue: webmin: /webmin-module-fail2ban/usr/lib/webmin/webmin/fail2ban/lang/no is owned by gid 100, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] WARNING: QA Issue: webmin: /webmin-module-system-status/usr/lib/webmin/webmin/system-status/lang/no is owned by gid 100, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] Do the install in a similar way as is done in bin_package.bbclass. By doing that, we're not getting any QA-errors from host-user-contaminated. Signed-off-by: Anders Darander Signed-off-by: Martin Jansa --- meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta-webserver/recipes-webadmin/webmin') diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb index b6fbb0a718..ca09ecfcfc 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb @@ -80,7 +80,10 @@ do_install() { install -d ${D}${localstatedir}/webmin install -d ${D}${libexecdir}/webmin - cp -pPR ${S}/* ${D}${libexecdir}/webmin + cd ${S} || exit 1 + tar --no-same-owner --exclude='./patches' --exclude='./.pc' -cpf - . \ + | tar --no-same-owner -xpf - -C ${D}${libexecdir}/webmin + rm -f ${D}${libexecdir}/webmin/webmin-init rm -f ${D}${libexecdir}/webmin/ajaxterm/ajaxterm/configure.initd.gentoo rm -rf ${D}${libexecdir}/webmin/patches -- cgit v1.2.3-54-g00ecf