1 |
commit: c1f2a1cdabfbcc0d301fe56a03022619d691e0cc |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 4 20:18:46 2016 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 4 20:19:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f2a1cd |
7 |
|
8 |
net-misc/openvswitch: fixing install when using monitor |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
net-misc/openvswitch/openvswitch-2.6.0.ebuild | 23 +++++++++-------------- |
13 |
1 file changed, 9 insertions(+), 14 deletions(-) |
14 |
|
15 |
diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild |
16 |
index b80877a..e757a24 100644 |
17 |
--- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild |
18 |
+++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild |
19 |
@@ -48,7 +48,6 @@ pkg_setup() { |
20 |
CONFIG_CHECK+=" ~OPENVSWITCH" |
21 |
linux-info_pkg_setup |
22 |
fi |
23 |
- use monitor && python-r1_pkg_setup |
24 |
} |
25 |
|
26 |
src_prepare() { |
27 |
@@ -69,7 +68,7 @@ src_configure() { |
28 |
local linux_config |
29 |
use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
30 |
|
31 |
- PYTHON=python2.7 econf ${linux_config} \ |
32 |
+ econf ${linux_config} \ |
33 |
--with-rundir=/var/run/openvswitch \ |
34 |
--with-logdir=/var/log/openvswitch \ |
35 |
--with-pkidir=/etc/ssl/openvswitch \ |
36 |
@@ -81,26 +80,22 @@ src_configure() { |
37 |
src_compile() { |
38 |
default |
39 |
|
40 |
-# use monitor && python_fix_shebang \ |
41 |
-# utilities/ovs-{pcap,tcpundump,test,vlan-test} \ |
42 |
-# utilities/bugtool/ovs-bugtool |
43 |
- if use monitor; then |
44 |
- sed -i \ |
45 |
- 's/^#\!\ python2\.7/#\!\/usr\/bin\/env\ python2\.7/' \ |
46 |
- utilities/ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} \ |
47 |
- utilities/bugtool/ovs-bugtool || die "sed died :(" |
48 |
- fi |
49 |
- |
50 |
use modules && linux-mod_src_compile |
51 |
} |
52 |
|
53 |
src_install() { |
54 |
default |
55 |
+ for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
56 |
+ python_replicate_script utilities/"${SCRIPT}" |
57 |
+ done |
58 |
|
59 |
if use monitor ; then |
60 |
- python_domodule "${ED}"/usr/share/openvswitch/python/* |
61 |
+ python_install() { |
62 |
+ python_domodule "${ED}"/usr/share/openvswitch/python/* |
63 |
+ python_optimize "${ED}/usr/share/ovsdbmonitor" |
64 |
+ } |
65 |
+ python_foreach_impl python_install |
66 |
rm -r "${ED}/usr/share/openvswitch/python" |
67 |
- python_optimize "${ED}/usr/share/ovsdbmonitor" |
68 |
fi |
69 |
# not working without the brcompat_mod kernel module which did not get |
70 |
# included in the kernel and we can't build it anymore |