1 |
commit: 4ff788a2c2d044128f5f1c24ecb01b9494d4a5ff |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 27 15:07:07 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 27 15:25:41 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff788a2 |
7 |
|
8 |
net-misc/openvswitch: cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.16 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
net-misc/openvswitch/Manifest | 3 - |
14 |
net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild | 154 ---------------------- |
15 |
net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild | 147 --------------------- |
16 |
net-misc/openvswitch/openvswitch-2.10.1.ebuild | 142 -------------------- |
17 |
net-misc/openvswitch/openvswitch-2.8.1.ebuild | 151 --------------------- |
18 |
5 files changed, 597 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest |
21 |
index 67563a392ef..e0afa7107db 100644 |
22 |
--- a/net-misc/openvswitch/Manifest |
23 |
+++ b/net-misc/openvswitch/Manifest |
24 |
@@ -1,5 +1,2 @@ |
25 |
-DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216 |
26 |
-DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44 |
27 |
DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1 |
28 |
DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea133331b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789 |
29 |
-DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 |
30 |
|
31 |
diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index 7d1e0be6561..00000000000 |
34 |
--- a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,154 +0,0 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
43 |
- |
44 |
-inherit autotools eutils linux-info linux-mod python-r1 systemd versionator |
45 |
- |
46 |
-DESCRIPTION="Production quality, multilayer virtual switch" |
47 |
-HOMEPAGE="https://www.openvswitch.org" |
48 |
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" |
49 |
- |
50 |
-LICENSE="Apache-2.0 GPL-2" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="amd64 ~arm64 x86" |
53 |
-IUSE="debug modules monitor +ssl" |
54 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
55 |
- |
56 |
-RDEPEND=" |
57 |
- ssl? ( dev-libs/openssl:0= ) |
58 |
- ${PYTHON_DEPS} |
59 |
- ~dev-python/ovs-2.9.2[${PYTHON_USEDEP}] |
60 |
- || ( |
61 |
- dev-python/twisted[conch,${PYTHON_USEDEP}] |
62 |
- dev-python/twisted-web[${PYTHON_USEDEP}] |
63 |
- ) |
64 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
65 |
- debug? ( dev-lang/perl )" |
66 |
-DEPEND="${RDEPEND} |
67 |
- virtual/pkgconfig" |
68 |
- |
69 |
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
70 |
- |
71 |
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
72 |
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
73 |
-BUILD_TARGETS="all" |
74 |
- |
75 |
-pkg_setup() { |
76 |
- if use modules ; then |
77 |
- CONFIG_CHECK+=" ~!OPENVSWITCH" |
78 |
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
79 |
- # docs state 4.17.x code states 4.15.x |
80 |
- kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" |
81 |
- linux-mod_pkg_setup |
82 |
- else |
83 |
- CONFIG_CHECK+=" ~OPENVSWITCH" |
84 |
- linux-info_pkg_setup |
85 |
- fi |
86 |
-} |
87 |
- |
88 |
-src_prepare() { |
89 |
- # Never build kernelmodules, doing this manually |
90 |
- sed -i \ |
91 |
- -e '/^SUBDIRS/d' \ |
92 |
- datapath/Makefile.in || die "sed failed" |
93 |
- eautoreconf |
94 |
- default |
95 |
-} |
96 |
- |
97 |
-src_configure() { |
98 |
- set_arch_to_kernel |
99 |
- # monitor is statically enabled for bug 596206 |
100 |
- # use monitor || export ovs_cv_python="no" |
101 |
- # pyside is staticly disabled |
102 |
- export ovs_cv_pyuic4="no" |
103 |
- |
104 |
- local linux_config |
105 |
- use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
106 |
- |
107 |
- econf ${linux_config} \ |
108 |
- --with-rundir=/var/run/openvswitch \ |
109 |
- --with-logdir=/var/log/openvswitch \ |
110 |
- --with-pkidir=/etc/ssl/openvswitch \ |
111 |
- --with-dbdir=/var/lib/openvswitch \ |
112 |
- $(use_enable ssl) \ |
113 |
- $(use_enable !debug ndebug) |
114 |
-} |
115 |
- |
116 |
-src_compile() { |
117 |
- default |
118 |
- |
119 |
- use modules && linux-mod_src_compile |
120 |
-} |
121 |
- |
122 |
-src_install() { |
123 |
- default |
124 |
- |
125 |
- local SCRIPT |
126 |
- if use monitor; then |
127 |
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
128 |
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" |
129 |
- python_foreach_impl python_doscript utilities/"${SCRIPT}" |
130 |
- done |
131 |
- rm -r "${ED%/}"/usr/share/openvswitch/python || die |
132 |
- fi |
133 |
- |
134 |
- keepdir /var/{lib,log}/openvswitch |
135 |
- keepdir /etc/ssl/openvswitch |
136 |
- fperms 0750 /etc/ssl/openvswitch |
137 |
- |
138 |
- rm -rf "${ED%/}"/var/run || die |
139 |
- |
140 |
- newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
141 |
- newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd |
142 |
- newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |
143 |
- newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd |
144 |
- |
145 |
- systemd_newunit "${FILESDIR}/ovsdb-server-r2.service" ovsdb-server.service |
146 |
- systemd_newunit "${FILESDIR}/ovs-vswitchd-r2.service" ovs-vswitchd.service |
147 |
- systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service |
148 |
- systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf |
149 |
- |
150 |
- insinto /etc/logrotate.d |
151 |
- newins rhel/etc_logrotate.d_openvswitch openvswitch |
152 |
- |
153 |
- use modules && linux-mod_src_install |
154 |
-} |
155 |
- |
156 |
-pkg_postinst() { |
157 |
- use modules && linux-mod_pkg_postinst |
158 |
- |
159 |
- local pv |
160 |
- for pv in ${REPLACING_VERSIONS}; do |
161 |
- if ! version_is_at_least 1.9.0 ${pv} ; then |
162 |
- ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from" |
163 |
- ewarn " /etc/openvswitch" |
164 |
- ewarn "to" |
165 |
- ewarn " /var/lib/openvswitch" |
166 |
- ewarn "Please copy/move the database manually before running the schema upgrade." |
167 |
- ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch" |
168 |
- fi |
169 |
- done |
170 |
- |
171 |
- # only needed on non-systemd, but helps anyway |
172 |
- elog "Use the following command to create an initial database for ovsdb-server:" |
173 |
- elog " emerge --config =${CATEGORY}/${PF}" |
174 |
- elog "(will create a database in /var/lib/openvswitch/conf.db)" |
175 |
- elog "or to convert the database to the current schema after upgrading." |
176 |
-} |
177 |
- |
178 |
-pkg_config() { |
179 |
- local db="${EROOT%/}"/var/lib/openvswitch/conf.db |
180 |
- if [[ -e "${db}" ]] ; then |
181 |
- einfo "Database '${db}' already exists, doing schema migration..." |
182 |
- einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
183 |
- ovsdb-tool convert "${db}" \ |
184 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" |
185 |
- else |
186 |
- einfo "Creating new database '${db}'..." |
187 |
- ovsdb-tool create "${db}" \ |
188 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" |
189 |
- fi |
190 |
-} |
191 |
|
192 |
diff --git a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild |
193 |
deleted file mode 100644 |
194 |
index 35f6bd871b8..00000000000 |
195 |
--- a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild |
196 |
+++ /dev/null |
197 |
@@ -1,147 +0,0 @@ |
198 |
-# Copyright 1999-2019 Gentoo Authors |
199 |
-# Distributed under the terms of the GNU General Public License v2 |
200 |
- |
201 |
-EAPI=6 |
202 |
- |
203 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
204 |
- |
205 |
-inherit autotools eutils linux-info linux-mod python-r1 systemd |
206 |
- |
207 |
-DESCRIPTION="Production quality, multilayer virtual switch" |
208 |
-HOMEPAGE="https://www.openvswitch.org" |
209 |
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" |
210 |
- |
211 |
-LICENSE="Apache-2.0 GPL-2" |
212 |
-SLOT="0" |
213 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
214 |
-IUSE="debug modules monitor +ssl" |
215 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
216 |
- |
217 |
-RDEPEND=" |
218 |
- ssl? ( dev-libs/openssl:0= ) |
219 |
- ${PYTHON_DEPS} |
220 |
- ~dev-python/ovs-2.10.0[${PYTHON_USEDEP}] |
221 |
- || ( |
222 |
- dev-python/twisted[conch,${PYTHON_USEDEP}] |
223 |
- dev-python/twisted-web[${PYTHON_USEDEP}] |
224 |
- ) |
225 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
226 |
- debug? ( dev-lang/perl )" |
227 |
-DEPEND="${RDEPEND} |
228 |
- sys-apps/util-linux[caps] |
229 |
- virtual/pkgconfig" |
230 |
- |
231 |
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
232 |
- |
233 |
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
234 |
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
235 |
-BUILD_TARGETS="all" |
236 |
- |
237 |
-pkg_setup() { |
238 |
- if use modules ; then |
239 |
- CONFIG_CHECK+=" ~!OPENVSWITCH" |
240 |
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
241 |
- # docs state 4.17.x code states 4.15.x |
242 |
- kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" |
243 |
- linux-mod_pkg_setup |
244 |
- else |
245 |
- CONFIG_CHECK+=" ~OPENVSWITCH" |
246 |
- linux-info_pkg_setup |
247 |
- fi |
248 |
-} |
249 |
- |
250 |
-src_prepare() { |
251 |
- # Never build kernelmodules, doing this manually |
252 |
- sed -i \ |
253 |
- -e '/^SUBDIRS/d' \ |
254 |
- datapath/Makefile.in || die "sed failed" |
255 |
- eautoreconf |
256 |
- default |
257 |
-} |
258 |
- |
259 |
-src_configure() { |
260 |
- set_arch_to_kernel |
261 |
- # monitor is statically enabled for bug 596206 |
262 |
- # use monitor || export ovs_cv_python="no" |
263 |
- # pyside is staticly disabled |
264 |
- export ovs_cv_pyuic4="no" |
265 |
- |
266 |
- # flake8 is primarily a style guide tool, running it as part of the tests |
267 |
- # in Gentoo does not make much sense, only breaks them: bug 607280 |
268 |
- export ovs_cv_flake8="no" |
269 |
- |
270 |
- local linux_config |
271 |
- use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
272 |
- |
273 |
- econf ${linux_config} \ |
274 |
- --with-rundir=/var/run/openvswitch \ |
275 |
- --with-logdir=/var/log/openvswitch \ |
276 |
- --with-pkidir=/etc/ssl/openvswitch \ |
277 |
- --with-dbdir=/var/lib/openvswitch \ |
278 |
- $(use_enable ssl) \ |
279 |
- $(use_enable !debug ndebug) |
280 |
-} |
281 |
- |
282 |
-src_compile() { |
283 |
- default |
284 |
- |
285 |
- use modules && linux-mod_src_compile |
286 |
-} |
287 |
- |
288 |
-src_install() { |
289 |
- default |
290 |
- |
291 |
- local SCRIPT |
292 |
- if use monitor; then |
293 |
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
294 |
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" |
295 |
- python_foreach_impl python_doscript utilities/"${SCRIPT}" |
296 |
- done |
297 |
- rm -r "${ED%/}"/usr/share/openvswitch/python || die |
298 |
- fi |
299 |
- |
300 |
- keepdir /var/{lib,log}/openvswitch |
301 |
- keepdir /etc/ssl/openvswitch |
302 |
- fperms 0750 /etc/ssl/openvswitch |
303 |
- |
304 |
- rm -rf "${ED%/}"/var/run || die |
305 |
- |
306 |
- newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
307 |
- newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd |
308 |
- newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |
309 |
- newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd |
310 |
- |
311 |
- systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service |
312 |
- systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service |
313 |
- systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service |
314 |
- systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf |
315 |
- |
316 |
- insinto /etc/logrotate.d |
317 |
- newins rhel/etc_logrotate.d_openvswitch openvswitch |
318 |
- |
319 |
- use modules && linux-mod_src_install |
320 |
-} |
321 |
- |
322 |
-pkg_postinst() { |
323 |
- use modules && linux-mod_pkg_postinst |
324 |
- |
325 |
- # only needed on non-systemd, but helps anyway |
326 |
- elog "Use the following command to create an initial database for ovsdb-server:" |
327 |
- elog " emerge --config =${CATEGORY}/${PF}" |
328 |
- elog "(will create a database in /var/lib/openvswitch/conf.db)" |
329 |
- elog "or to convert the database to the current schema after upgrading." |
330 |
-} |
331 |
- |
332 |
-pkg_config() { |
333 |
- local db="${EROOT%/}"/var/lib/openvswitch/conf.db |
334 |
- if [[ -e "${db}" ]] ; then |
335 |
- einfo "Database '${db}' already exists, doing schema migration..." |
336 |
- einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
337 |
- ovsdb-tool convert "${db}" \ |
338 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" |
339 |
- else |
340 |
- einfo "Creating new database '${db}'..." |
341 |
- ovsdb-tool create "${db}" \ |
342 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" |
343 |
- fi |
344 |
-} |
345 |
|
346 |
diff --git a/net-misc/openvswitch/openvswitch-2.10.1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1.ebuild |
347 |
deleted file mode 100644 |
348 |
index 103c6c1bafb..00000000000 |
349 |
--- a/net-misc/openvswitch/openvswitch-2.10.1.ebuild |
350 |
+++ /dev/null |
351 |
@@ -1,142 +0,0 @@ |
352 |
-# Copyright 1999-2019 Gentoo Authors |
353 |
-# Distributed under the terms of the GNU General Public License v2 |
354 |
- |
355 |
-EAPI=6 |
356 |
- |
357 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
358 |
- |
359 |
-inherit autotools eutils linux-info linux-mod python-r1 systemd |
360 |
- |
361 |
-DESCRIPTION="Production quality, multilayer virtual switch" |
362 |
-HOMEPAGE="https://www.openvswitch.org" |
363 |
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" |
364 |
- |
365 |
-LICENSE="Apache-2.0 GPL-2" |
366 |
-SLOT="0" |
367 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
368 |
-IUSE="debug modules monitor +ssl" |
369 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
370 |
- |
371 |
-RDEPEND=" |
372 |
- ssl? ( dev-libs/openssl:0= ) |
373 |
- ${PYTHON_DEPS} |
374 |
- ~dev-python/ovs-2.10.0[${PYTHON_USEDEP}] |
375 |
- || ( |
376 |
- dev-python/twisted[conch,${PYTHON_USEDEP}] |
377 |
- dev-python/twisted-web[${PYTHON_USEDEP}] |
378 |
- ) |
379 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
380 |
- debug? ( dev-lang/perl )" |
381 |
-DEPEND="${RDEPEND} |
382 |
- virtual/pkgconfig" |
383 |
- |
384 |
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
385 |
- |
386 |
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
387 |
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
388 |
-BUILD_TARGETS="all" |
389 |
- |
390 |
-pkg_setup() { |
391 |
- if use modules ; then |
392 |
- CONFIG_CHECK+=" ~!OPENVSWITCH" |
393 |
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
394 |
- # docs state 4.17.x code states 4.15.x |
395 |
- kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" |
396 |
- linux-mod_pkg_setup |
397 |
- else |
398 |
- CONFIG_CHECK+=" ~OPENVSWITCH" |
399 |
- linux-info_pkg_setup |
400 |
- fi |
401 |
-} |
402 |
- |
403 |
-src_prepare() { |
404 |
- # Never build kernelmodules, doing this manually |
405 |
- sed -i \ |
406 |
- -e '/^SUBDIRS/d' \ |
407 |
- datapath/Makefile.in || die "sed failed" |
408 |
- eautoreconf |
409 |
- default |
410 |
-} |
411 |
- |
412 |
-src_configure() { |
413 |
- set_arch_to_kernel |
414 |
- # monitor is statically enabled for bug 596206 |
415 |
- # use monitor || export ovs_cv_python="no" |
416 |
- # pyside is staticly disabled |
417 |
- export ovs_cv_pyuic4="no" |
418 |
- |
419 |
- local linux_config |
420 |
- use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
421 |
- |
422 |
- econf ${linux_config} \ |
423 |
- --with-rundir=/var/run/openvswitch \ |
424 |
- --with-logdir=/var/log/openvswitch \ |
425 |
- --with-pkidir=/etc/ssl/openvswitch \ |
426 |
- --with-dbdir=/var/lib/openvswitch \ |
427 |
- $(use_enable ssl) \ |
428 |
- $(use_enable !debug ndebug) |
429 |
-} |
430 |
- |
431 |
-src_compile() { |
432 |
- default |
433 |
- |
434 |
- use modules && linux-mod_src_compile |
435 |
-} |
436 |
- |
437 |
-src_install() { |
438 |
- default |
439 |
- |
440 |
- local SCRIPT |
441 |
- if use monitor; then |
442 |
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
443 |
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" |
444 |
- python_foreach_impl python_doscript utilities/"${SCRIPT}" |
445 |
- done |
446 |
- rm -r "${ED%/}"/usr/share/openvswitch/python || die |
447 |
- fi |
448 |
- |
449 |
- keepdir /var/{lib,log}/openvswitch |
450 |
- keepdir /etc/ssl/openvswitch |
451 |
- fperms 0750 /etc/ssl/openvswitch |
452 |
- |
453 |
- rm -rf "${ED%/}"/var/run || die |
454 |
- |
455 |
- newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
456 |
- newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd |
457 |
- newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |
458 |
- newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd |
459 |
- |
460 |
- systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service |
461 |
- systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service |
462 |
- systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service |
463 |
- systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf |
464 |
- |
465 |
- insinto /etc/logrotate.d |
466 |
- newins rhel/etc_logrotate.d_openvswitch openvswitch |
467 |
- |
468 |
- use modules && linux-mod_src_install |
469 |
-} |
470 |
- |
471 |
-pkg_postinst() { |
472 |
- use modules && linux-mod_pkg_postinst |
473 |
- |
474 |
- # only needed on non-systemd, but helps anyway |
475 |
- elog "Use the following command to create an initial database for ovsdb-server:" |
476 |
- elog " emerge --config =${CATEGORY}/${PF}" |
477 |
- elog "(will create a database in /var/lib/openvswitch/conf.db)" |
478 |
- elog "or to convert the database to the current schema after upgrading." |
479 |
-} |
480 |
- |
481 |
-pkg_config() { |
482 |
- local db="${EROOT%/}"/var/lib/openvswitch/conf.db |
483 |
- if [[ -e "${db}" ]] ; then |
484 |
- einfo "Database '${db}' already exists, doing schema migration..." |
485 |
- einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
486 |
- ovsdb-tool convert "${db}" \ |
487 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" |
488 |
- else |
489 |
- einfo "Creating new database '${db}'..." |
490 |
- ovsdb-tool create "${db}" \ |
491 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" |
492 |
- fi |
493 |
-} |
494 |
|
495 |
diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild |
496 |
deleted file mode 100644 |
497 |
index 2e0d26d9fb9..00000000000 |
498 |
--- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild |
499 |
+++ /dev/null |
500 |
@@ -1,151 +0,0 @@ |
501 |
-# Copyright 1999-2019 Gentoo Authors |
502 |
-# Distributed under the terms of the GNU General Public License v2 |
503 |
- |
504 |
-EAPI=6 |
505 |
- |
506 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
507 |
- |
508 |
-inherit autotools eutils linux-info linux-mod python-r1 systemd versionator |
509 |
- |
510 |
-DESCRIPTION="Production quality, multilayer virtual switch" |
511 |
-HOMEPAGE="https://www.openvswitch.org" |
512 |
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" |
513 |
- |
514 |
-LICENSE="Apache-2.0 GPL-2" |
515 |
-SLOT="0" |
516 |
-KEYWORDS="amd64 ~arm64 ~x86" |
517 |
-IUSE="debug modules monitor +ssl" |
518 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
519 |
- |
520 |
-RDEPEND=" |
521 |
- ssl? ( dev-libs/openssl:0= ) |
522 |
- ${PYTHON_DEPS} |
523 |
- ~dev-python/ovs-2.7.2[${PYTHON_USEDEP}] |
524 |
- || ( |
525 |
- dev-python/twisted[conch,${PYTHON_USEDEP}] |
526 |
- dev-python/twisted-web[${PYTHON_USEDEP}] |
527 |
- ) |
528 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
529 |
- debug? ( dev-lang/perl )" |
530 |
-DEPEND="${RDEPEND} |
531 |
- virtual/pkgconfig" |
532 |
- |
533 |
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
534 |
- |
535 |
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
536 |
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
537 |
-BUILD_TARGETS="all" |
538 |
- |
539 |
-pkg_setup() { |
540 |
- if use modules ; then |
541 |
- CONFIG_CHECK+=" ~!OPENVSWITCH" |
542 |
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
543 |
- kernel_is le 4 12 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" |
544 |
- linux-mod_pkg_setup |
545 |
- else |
546 |
- CONFIG_CHECK+=" ~OPENVSWITCH" |
547 |
- linux-info_pkg_setup |
548 |
- fi |
549 |
-} |
550 |
- |
551 |
-src_prepare() { |
552 |
- # Never build kernelmodules, doing this manually |
553 |
- sed -i \ |
554 |
- -e '/^SUBDIRS/d' \ |
555 |
- datapath/Makefile.in || die "sed failed" |
556 |
- eautoreconf |
557 |
- default |
558 |
-} |
559 |
- |
560 |
-src_configure() { |
561 |
- set_arch_to_kernel |
562 |
- # monitor is statically enabled for bug 596206 |
563 |
- # use monitor || export ovs_cv_python="no" |
564 |
- # pyside is staticly disabled |
565 |
- export ovs_cv_pyuic4="no" |
566 |
- |
567 |
- local linux_config |
568 |
- use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
569 |
- |
570 |
- econf ${linux_config} \ |
571 |
- --with-rundir=/var/run/openvswitch \ |
572 |
- --with-logdir=/var/log/openvswitch \ |
573 |
- --with-pkidir=/etc/ssl/openvswitch \ |
574 |
- --with-dbdir=/var/lib/openvswitch \ |
575 |
- $(use_enable ssl) \ |
576 |
- $(use_enable !debug ndebug) |
577 |
-} |
578 |
- |
579 |
-src_compile() { |
580 |
- default |
581 |
- |
582 |
- use modules && linux-mod_src_compile |
583 |
-} |
584 |
- |
585 |
-src_install() { |
586 |
- default |
587 |
- |
588 |
- local SCRIPT |
589 |
- if use monitor; then |
590 |
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
591 |
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" |
592 |
- python_foreach_impl python_doscript utilities/"${SCRIPT}" |
593 |
- done |
594 |
- rm -r "${ED%/}"/usr/share/openvswitch/python || die |
595 |
- fi |
596 |
- |
597 |
- keepdir /var/{lib,log}/openvswitch |
598 |
- keepdir /etc/ssl/openvswitch |
599 |
- fperms 0750 /etc/ssl/openvswitch |
600 |
- |
601 |
- rm -rf "${ED%/}"/var/run || die |
602 |
- |
603 |
- newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
604 |
- newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd |
605 |
- newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |
606 |
- newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd |
607 |
- |
608 |
- systemd_dounit "${FILESDIR}/ovsdb-server.service" |
609 |
- systemd_dounit "${FILESDIR}/ovs-vswitchd.service" |
610 |
- systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf |
611 |
- |
612 |
- insinto /etc/logrotate.d |
613 |
- newins rhel/etc_logrotate.d_openvswitch openvswitch |
614 |
- |
615 |
- use modules && linux-mod_src_install |
616 |
-} |
617 |
- |
618 |
-pkg_postinst() { |
619 |
- use modules && linux-mod_pkg_postinst |
620 |
- |
621 |
- local pv |
622 |
- for pv in ${REPLACING_VERSIONS}; do |
623 |
- if ! version_is_at_least 1.9.0 ${pv} ; then |
624 |
- ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from" |
625 |
- ewarn " /etc/openvswitch" |
626 |
- ewarn "to" |
627 |
- ewarn " /var/lib/openvswitch" |
628 |
- ewarn "Please copy/move the database manually before running the schema upgrade." |
629 |
- ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch" |
630 |
- fi |
631 |
- done |
632 |
- |
633 |
- elog "Use the following command to create an initial database for ovsdb-server:" |
634 |
- elog " emerge --config =${CATEGORY}/${PF}" |
635 |
- elog "(will create a database in /var/lib/openvswitch/conf.db)" |
636 |
- elog "or to convert the database to the current schema after upgrading." |
637 |
-} |
638 |
- |
639 |
-pkg_config() { |
640 |
- local db="${EROOT%/}"/var/lib/openvswitch/conf.db |
641 |
- if [[ -e "${db}" ]] ; then |
642 |
- einfo "Database '${db}' already exists, doing schema migration..." |
643 |
- einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
644 |
- ovsdb-tool convert "${db}" \ |
645 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" |
646 |
- else |
647 |
- einfo "Creating new database '${db}'..." |
648 |
- ovsdb-tool create "${db}" \ |
649 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" |
650 |
- fi |
651 |
-} |