diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-07-29 10:09:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-07-29 10:09:28 +0000 |
| commit | db4944735460e64428a85d66fa9135e3392a7550 (patch) | |
| tree | 381be90272285439a8d0fd09a1f66b2d03703853 /app-emulation | |
| parent | Update PaX markings on system binaries before executing tests with them #5155... (diff) | |
| download | gentoo-2-db4944735460e64428a85d66fa9135e3392a7550.tar.gz gentoo-2-db4944735460e64428a85d66fa9135e3392a7550.tar.bz2 gentoo-2-db4944735460e64428a85d66fa9135e3392a7550.zip | |
Do not attempt to set fcaps on virtfs-proxy-helper when it does not exist #516874 by Joakim Tjernlund.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-2.0.0-r1.ebuild | 12 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 12 |
3 files changed, 16 insertions, 15 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog index efb1e0b39267..9182b1d9e37c 100644 --- a/app-emulation/qemu/ChangeLog +++ b/app-emulation/qemu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.269 2014/07/29 09:50:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.270 2014/07/29 10:09:28 vapier Exp $ + + 29 Jul 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.0.0-r1.ebuild, + qemu-9999.ebuild: + Do not attempt to set fcaps on virtfs-proxy-helper when it does not exist + #516874 by Joakim Tjernlund. 29 Jul 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.0.0-r1.ebuild, qemu-9999.ebuild: diff --git a/app-emulation/qemu/qemu-2.0.0-r1.ebuild b/app-emulation/qemu/qemu-2.0.0-r1.ebuild index 45e9aa8c9d66..263785e91a4e 100644 --- a/app-emulation/qemu/qemu-2.0.0-r1.ebuild +++ b/app-emulation/qemu/qemu-2.0.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.6 2014/07/29 09:50:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.7 2014/07/29 10:09:28 vapier Exp $ EAPI=5 @@ -533,8 +533,6 @@ src_install() { } pkg_postinst() { - local virtfs_caps= - if qemu_support_kvm; then readme.gentoo_print_elog ewarn "Migration from qemu-kvm instances and loading qemu-kvm created" @@ -554,11 +552,11 @@ pkg_postinst() { fi fi - virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid," - virtfs_caps+="cap_setgid,cap_mknod,cap_setuid" - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper - use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper + if use virtfs && [ -n "${softmmu_targets}" ]; then + local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid" + fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper + fi } pkg_info() { diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index df254059a679..8bd7a6f20527 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.76 2014/07/29 09:50:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.77 2014/07/29 10:09:28 vapier Exp $ EAPI=5 @@ -527,8 +527,6 @@ src_install() { } pkg_postinst() { - local virtfs_caps= - if qemu_support_kvm; then readme.gentoo_print_elog ewarn "Migration from qemu-kvm instances and loading qemu-kvm created" @@ -548,11 +546,11 @@ pkg_postinst() { fi fi - virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid," - virtfs_caps+="cap_setgid,cap_mknod,cap_setuid" - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper - use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper + if use virtfs && [ -n "${softmmu_targets}" ]; then + local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid" + fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper + fi } pkg_info() { |