Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild qemu-2.0.0-r1.ebuild ChangeLog
Date: Tue, 29 Jul 2014 10:09:37
Message-Id: 20140729100929.326D72004E@flycatcher.gentoo.org
1 vapier 14/07/29 10:09:28
2
3 Modified: qemu-9999.ebuild qemu-2.0.0-r1.ebuild ChangeLog
4 Log:
5 Do not attempt to set fcaps on virtfs-proxy-helper when it does not exist #516874 by Joakim Tjernlund.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.77 app-emulation/qemu/qemu-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.77&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.77&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.76&r2=1.77
15
16 Index: qemu-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
19 retrieving revision 1.76
20 retrieving revision 1.77
21 diff -u -r1.76 -r1.77
22 --- qemu-9999.ebuild 29 Jul 2014 09:50:22 -0000 1.76
23 +++ qemu-9999.ebuild 29 Jul 2014 10:09:28 -0000 1.77
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.76 2014/07/29 09:50:22 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.77 2014/07/29 10:09:28 vapier Exp $
29
30 EAPI=5
31
32 @@ -527,8 +527,6 @@
33 }
34
35 pkg_postinst() {
36 - local virtfs_caps=
37 -
38 if qemu_support_kvm; then
39 readme.gentoo_print_elog
40 ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
41 @@ -548,11 +546,11 @@
42 fi
43 fi
44
45 - virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
46 - virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
47 -
48 fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
49 - use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
50 + if use virtfs && [ -n "${softmmu_targets}" ]; then
51 + local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
52 + fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
53 + fi
54 }
55
56 pkg_info() {
57
58
59
60 1.7 app-emulation/qemu/qemu-2.0.0-r1.ebuild
61
62 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.7&view=markup
63 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
64 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.6&r2=1.7
65
66 Index: qemu-2.0.0-r1.ebuild
67 ===================================================================
68 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v
69 retrieving revision 1.6
70 retrieving revision 1.7
71 diff -u -r1.6 -r1.7
72 --- qemu-2.0.0-r1.ebuild 29 Jul 2014 09:50:22 -0000 1.6
73 +++ qemu-2.0.0-r1.ebuild 29 Jul 2014 10:09:28 -0000 1.7
74 @@ -1,6 +1,6 @@
75 # Copyright 1999-2014 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 -# $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 $
78 +# $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 $
79
80 EAPI=5
81
82 @@ -533,8 +533,6 @@
83 }
84
85 pkg_postinst() {
86 - local virtfs_caps=
87 -
88 if qemu_support_kvm; then
89 readme.gentoo_print_elog
90 ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
91 @@ -554,11 +552,11 @@
92 fi
93 fi
94
95 - virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
96 - virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
97 -
98 fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
99 - use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
100 + if use virtfs && [ -n "${softmmu_targets}" ]; then
101 + local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
102 + fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
103 + fi
104 }
105
106 pkg_info() {
107
108
109
110 1.270 app-emulation/qemu/ChangeLog
111
112 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.270&view=markup
113 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.270&content-type=text/plain
114 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.269&r2=1.270
115
116 Index: ChangeLog
117 ===================================================================
118 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
119 retrieving revision 1.269
120 retrieving revision 1.270
121 diff -u -r1.269 -r1.270
122 --- ChangeLog 29 Jul 2014 09:50:22 -0000 1.269
123 +++ ChangeLog 29 Jul 2014 10:09:28 -0000 1.270
124 @@ -1,6 +1,11 @@
125 # ChangeLog for app-emulation/qemu
126 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
127 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.269 2014/07/29 09:50:22 vapier Exp $
128 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.270 2014/07/29 10:09:28 vapier Exp $
129 +
130 + 29 Jul 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild,
131 + qemu-9999.ebuild:
132 + Do not attempt to set fcaps on virtfs-proxy-helper when it does not exist
133 + #516874 by Joakim Tjernlund.
134
135 29 Jul 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild,
136 qemu-9999.ebuild: