vapier 14/07/29 10:09:28 Modified: qemu-9999.ebuild qemu-2.0.0-r1.ebuild ChangeLog Log: 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)
Revision Changes Path 1.77 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.77&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.77&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.76&r2=1.77 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- qemu-9999.ebuild 29 Jul 2014 09:50:22 -0000 1.76 +++ qemu-9999.ebuild 29 Jul 2014 10:09:28 -0000 1.77 @@ -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 @@ } 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 @@ 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() { 1.7 app-emulation/qemu/qemu-2.0.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.6&r2=1.7 Index: qemu-2.0.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu-2.0.0-r1.ebuild 29 Jul 2014 09:50:22 -0000 1.6 +++ qemu-2.0.0-r1.ebuild 29 Jul 2014 10:09:28 -0000 1.7 @@ -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 @@ } 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 @@ 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() { 1.270 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.270&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.270&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.269&r2=1.270 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- ChangeLog 29 Jul 2014 09:50:22 -0000 1.269 +++ ChangeLog 29 Jul 2014 10:09:28 -0000 1.270 @@ -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 <[email protected]> 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 <[email protected]> qemu-2.0.0-r1.ebuild, qemu-9999.ebuild:
