Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
Date: Sun, 05 Mar 2017 04:41:42
Message-Id: 1488688881.323451a495863127d1b5e542310d114e070dcb0b.prometheanfire@gentoo
1 commit: 323451a495863127d1b5e542310d114e070dcb0b
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 5 04:40:53 2017 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 5 04:41:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323451a4
7
8 net-misc/openvswitch: bup
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 net-misc/openvswitch/Manifest | 1 +
13 net-misc/openvswitch/openvswitch-2.7.0.ebuild | 153 ++++++++++++++++++++++++++
14 2 files changed, 154 insertions(+)
15
16 diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
17 index 27b53e07ab0..a1ce1ccc3fd 100644
18 --- a/net-misc/openvswitch/Manifest
19 +++ b/net-misc/openvswitch/Manifest
20 @@ -4,3 +4,4 @@ DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaef
21 DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d
22 DIST openvswitch-2.6.0.tar.gz 5386102 SHA256 c6f86b47b5847e739ca1c5a80059a804cd49e2b98eefef0fdbce1c4d93c7d0f1 SHA512 7bcf02a00b94924e7931642790f40a49b86338baa63405e9454bff20b82d5a53bbc43279c223946f082d050c73ce6caedcb8a1e52979c873262bc9e8ff84b42d WHIRLPOOL d275071d3491167d3672966381403e704580797eb53fb8d8da2de3c08efd614a709d70af256172670271601d8d90a1350f1c2fae0e9236f729b6c278d5038513
23 DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092
24 +DIST openvswitch-2.7.0.tar.gz 6149523 SHA256 e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e SHA512 d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 WHIRLPOOL 0c26e4488bfd3bea97415d9b4b00c87730bb35c2c059f3aff2fb0f7d3e34eed6308a4734ab88395dc435bd670ef584d89af9849d0cf6ea9dfe78168329e098cd
25
26 diff --git a/net-misc/openvswitch/openvswitch-2.7.0.ebuild b/net-misc/openvswitch/openvswitch-2.7.0.ebuild
27 new file mode 100644
28 index 00000000000..39ad5813aca
29 --- /dev/null
30 +++ b/net-misc/openvswitch/openvswitch-2.7.0.ebuild
31 @@ -0,0 +1,153 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +PYTHON_COMPAT=( python{2_7,3_4,3_5} )
38 +
39 +inherit autotools eutils linux-info linux-mod python-r1 systemd
40 +
41 +DESCRIPTION="Production quality, multilayer virtual switch"
42 +HOMEPAGE="http://openvswitch.org"
43 +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
44 +
45 +LICENSE="Apache-2.0 GPL-2"
46 +SLOT="0"
47 +KEYWORDS="~amd64 ~arm64 ~x86"
48 +IUSE="debug modules monitor +ssl"
49 +
50 +RDEPEND="
51 + || (
52 + >=sys-apps/openrc-0.10.5
53 + sys-apps/systemd
54 + )
55 + ssl? ( dev-libs/openssl:0= )
56 + ${PYTHON_DEPS}
57 + ~dev-python/ovs-${PV}
58 + dev-python/twisted-core
59 + dev-python/twisted-conch
60 + dev-python/twisted-web
61 + dev-python/zope-interface[${PYTHON_USEDEP}]
62 + debug? ( dev-lang/perl )"
63 +DEPEND="${RDEPEND}
64 + virtual/pkgconfig"
65 +
66 +PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
67 +
68 +CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
69 +MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
70 +BUILD_TARGETS="all"
71 +
72 +pkg_setup() {
73 + if use modules ; then
74 + CONFIG_CHECK+=" ~!OPENVSWITCH"
75 + kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
76 + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
77 + linux-mod_pkg_setup
78 + else
79 + CONFIG_CHECK+=" ~OPENVSWITCH"
80 + linux-info_pkg_setup
81 + fi
82 +}
83 +
84 +src_prepare() {
85 + # Never build kernelmodules, doing this manually
86 + sed -i \
87 + -e '/^SUBDIRS/d' \
88 + datapath/Makefile.in || die "sed failed"
89 + eautoreconf
90 + default
91 +}
92 +
93 +src_configure() {
94 + set_arch_to_kernel
95 + # monitor is statically enabled for bug 596206
96 + use monitor || export ovs_cv_python="no"
97 + # pyside is staticly disabled
98 + export ovs_cv_pyuic4="no"
99 +
100 + local linux_config
101 + use modules && linux_config="--with-linux=${KV_OUT_DIR}"
102 +
103 + econf ${linux_config} \
104 + --with-rundir=/var/run/openvswitch \
105 + --with-logdir=/var/log/openvswitch \
106 + --with-pkidir=/etc/ssl/openvswitch \
107 + --with-dbdir=/var/lib/openvswitch \
108 + $(use_enable ssl) \
109 + $(use_enable !debug ndebug)
110 +}
111 +
112 +src_compile() {
113 + default
114 +
115 + use modules && linux-mod_src_compile
116 +}
117 +
118 +src_install() {
119 + default
120 +
121 + local SCRIPT
122 + if use monitor; then
123 + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
124 + sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
125 + python_foreach_impl python_doscript utilities/"${SCRIPT}"
126 + done
127 + rm -r "${ED%/}"/usr/share/openvswitch/python || die
128 + fi
129 +
130 + keepdir /var/{lib,log}/openvswitch
131 + keepdir /etc/ssl/openvswitch
132 + fperms 0750 /etc/ssl/openvswitch
133 +
134 + rm -rf "${ED%/}"/var/run || die
135 +
136 + newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
137 + newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
138 + newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
139 + newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
140 +
141 + systemd_dounit "${FILESDIR}/ovsdb-server.service"
142 + systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
143 + systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
144 +
145 + insinto /etc/logrotate.d
146 + newins rhel/etc_logrotate.d_openvswitch openvswitch
147 +
148 + use modules && linux-mod_src_install
149 +}
150 +
151 +pkg_postinst() {
152 + use modules && linux-mod_pkg_postinst
153 +
154 + local pv
155 + for pv in ${REPLACING_VERSIONS}; do
156 + if ! version_is_at_least 1.9.0 ${pv} ; then
157 + ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
158 + ewarn " /etc/openvswitch"
159 + ewarn "to"
160 + ewarn " /var/lib/openvswitch"
161 + ewarn "Please copy/move the database manually before running the schema upgrade."
162 + ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
163 + fi
164 + done
165 +
166 + elog "Use the following command to create an initial database for ovsdb-server:"
167 + elog " emerge --config =${CATEGORY}/${PF}"
168 + elog "(will create a database in /var/lib/openvswitch/conf.db)"
169 + elog "or to convert the database to the current schema after upgrading."
170 +}
171 +
172 +pkg_config() {
173 + local db="${EROOT%/}"/var/lib/openvswitch/conf.db
174 + if [[ -e "${db}" ]] ; then
175 + einfo "Database '${db}' already exists, doing schema migration..."
176 + einfo "(if the migration fails, make sure that ovsdb-server is not running)"
177 + ovsdb-tool convert "${db}" \
178 + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
179 + else
180 + einfo "Creating new database '${db}'..."
181 + ovsdb-tool create "${db}" \
182 + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
183 + fi
184 +}