| 1 |
commit: 04532e97c67d089ffda10c6f77859b3ad2416649 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 5 00:16:34 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 5 00:16:34 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04532e97 |
| 7 |
|
| 8 |
net-misc/openvswitch: fixing bunch of small things |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
net-misc/openvswitch/openvswitch-2.6.0.ebuild | 21 +++++++++++---------- |
| 13 |
1 file changed, 11 insertions(+), 10 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 e757a24..b2c629c 100644 |
| 17 |
--- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild |
| 18 |
+++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild |
| 19 |
@@ -22,7 +22,7 @@ RDEPEND=" |
| 20 |
>=sys-apps/openrc-0.10.5 |
| 21 |
sys-apps/systemd |
| 22 |
) |
| 23 |
- ssl? ( dev-libs/openssl:= ) |
| 24 |
+ ssl? ( dev-libs/openssl:0 ) |
| 25 |
monitor? ( |
| 26 |
${PYTHON_DEPS} |
| 27 |
dev-python/twisted-core |
| 28 |
@@ -34,6 +34,8 @@ RDEPEND=" |
| 29 |
DEPEND="${RDEPEND} |
| 30 |
virtual/pkgconfig" |
| 31 |
|
| 32 |
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
| 33 |
+ |
| 34 |
CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
| 35 |
MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
| 36 |
BUILD_TARGETS="all" |
| 37 |
@@ -55,7 +57,6 @@ src_prepare() { |
| 38 |
sed -i \ |
| 39 |
-e '/^SUBDIRS/d' \ |
| 40 |
datapath/Makefile.in || die "sed failed" |
| 41 |
- epatch "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
| 42 |
eautoreconf |
| 43 |
default |
| 44 |
} |
| 45 |
@@ -91,23 +92,23 @@ src_install() { |
| 46 |
|
| 47 |
if use monitor ; then |
| 48 |
python_install() { |
| 49 |
- python_domodule "${ED}"/usr/share/openvswitch/python/* |
| 50 |
- python_optimize "${ED}/usr/share/ovsdbmonitor" |
| 51 |
+ python_domodule "${ED}"usr/share/openvswitch/python/* |
| 52 |
+ python_optimize "${ED}usr/share/ovsdbmonitor" |
| 53 |
} |
| 54 |
python_foreach_impl python_install |
| 55 |
- rm -r "${ED}/usr/share/openvswitch/python" |
| 56 |
+ rm -r "${ED}usr/share/openvswitch/python" || die "rm failed" |
| 57 |
fi |
| 58 |
# not working without the brcompat_mod kernel module which did not get |
| 59 |
# included in the kernel and we can't build it anymore |
| 60 |
- rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8" |
| 61 |
+ rm "${ED}usr/sbin/ovs-brcompatd" "${ED}usr/share/man/man8/ovs-brcompatd.8" |
| 62 |
|
| 63 |
keepdir /var/{lib,log}/openvswitch |
| 64 |
keepdir /etc/ssl/openvswitch |
| 65 |
fperms 0750 /etc/ssl/openvswitch |
| 66 |
|
| 67 |
- rm -rf "${ED}/var/run" |
| 68 |
- use monitor || rmdir "${ED}/usr/share/ovsdbmonitor" |
| 69 |
- use debug || rm "${ED}/usr/bin/ovs-parse-leaks" |
| 70 |
+ rm -rf "${ED}var/run" || die "rm failed" |
| 71 |
+ ! use monitor && rmdir "${ED}usr/share/ovsdbmonitor" || die "rm failed" |
| 72 |
+ ! use debug && rm "${ED}usr/bin/ovs-parse-leaks" die "rm failed" |
| 73 |
|
| 74 |
newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
| 75 |
newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd |
| 76 |
@@ -146,7 +147,7 @@ pkg_postinst() { |
| 77 |
|
| 78 |
pkg_config() { |
| 79 |
local db="${EPREFIX}/var/lib/openvswitch/conf.db" |
| 80 |
- if [ -e "${db}" ] ; then |
| 81 |
+ if [[ -e "${db}" ]] ; then |
| 82 |
einfo "Database '${db}' already exists, doing schema migration..." |
| 83 |
einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
| 84 |
"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed" |
Archives