aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2015-10-13 15:37:13 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-10-23 12:53:23 +0200
commit55fb2d1b25482f661242814532672b8f820b3b06 (patch)
tree80413217ba27de3c4dad3198f49ce9107f58df48 /meta-webserver
parent796f9ba6a6e3ba9d315b62d8e9f7f0873fe95b7c (diff)
downloadmeta-openembedded-contrib-55fb2d1b25482f661242814532672b8f820b3b06.tar.gz
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 <anders@chargestorm.se> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb5
1 files changed, 4 insertions, 1 deletions
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