1 |
commit: 0766ac4ed642a7a04ae8f50af3e8ef7e0243ff85 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 5 04:46:27 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 5 04:46:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0766ac4e |
7 |
|
8 |
net-misc/openvswitch: cleanup |
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.6.0-r2.ebuild | 159 --------------------- |
14 |
net-misc/openvswitch/openvswitch-2.6.0.ebuild | 167 ----------------------- |
15 |
3 files changed, 327 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest |
18 |
index a1ce1ccc3fd..6ab6f7f36ff 100644 |
19 |
--- a/net-misc/openvswitch/Manifest |
20 |
+++ b/net-misc/openvswitch/Manifest |
21 |
@@ -2,6 +2,5 @@ DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de |
22 |
DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1 |
23 |
DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e |
24 |
DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d |
25 |
-DIST openvswitch-2.6.0.tar.gz 5386102 SHA256 c6f86b47b5847e739ca1c5a80059a804cd49e2b98eefef0fdbce1c4d93c7d0f1 SHA512 7bcf02a00b94924e7931642790f40a49b86338baa63405e9454bff20b82d5a53bbc43279c223946f082d050c73ce6caedcb8a1e52979c873262bc9e8ff84b42d WHIRLPOOL d275071d3491167d3672966381403e704580797eb53fb8d8da2de3c08efd614a709d70af256172670271601d8d90a1350f1c2fae0e9236f729b6c278d5038513 |
26 |
DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092 |
27 |
DIST openvswitch-2.7.0.tar.gz 6149523 SHA256 e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e SHA512 d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 WHIRLPOOL 0c26e4488bfd3bea97415d9b4b00c87730bb35c2c059f3aff2fb0f7d3e34eed6308a4734ab88395dc435bd670ef584d89af9849d0cf6ea9dfe78168329e098cd |
28 |
|
29 |
diff --git a/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild b/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild |
30 |
deleted file mode 100644 |
31 |
index 62695c1b994..00000000000 |
32 |
--- a/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,159 +0,0 @@ |
35 |
-# Copyright 1999-2016 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
41 |
- |
42 |
-inherit autotools eutils linux-info linux-mod python-r1 systemd |
43 |
- |
44 |
-DESCRIPTION="Production quality, multilayer virtual switch" |
45 |
-HOMEPAGE="http://openvswitch.org" |
46 |
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz" |
47 |
- |
48 |
-LICENSE="Apache-2.0 GPL-2" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
51 |
-IUSE="debug modules monitor +ssl" |
52 |
- |
53 |
-RDEPEND=" |
54 |
- || ( |
55 |
- >=sys-apps/openrc-0.10.5 |
56 |
- sys-apps/systemd |
57 |
- ) |
58 |
- ssl? ( dev-libs/openssl:0= ) |
59 |
- ${PYTHON_DEPS} |
60 |
- ~dev-python/ovs-${PV} |
61 |
- dev-python/twisted-core |
62 |
- dev-python/twisted-conch |
63 |
- dev-python/twisted-web |
64 |
- dev-python/PyQt4[${PYTHON_USEDEP}] |
65 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
66 |
- debug? ( dev-lang/perl )" |
67 |
-DEPEND="${RDEPEND} |
68 |
- virtual/pkgconfig" |
69 |
- |
70 |
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
71 |
- |
72 |
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
73 |
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
74 |
-BUILD_TARGETS="all" |
75 |
- |
76 |
-pkg_setup() { |
77 |
- if use modules ; then |
78 |
- CONFIG_CHECK+=" ~!OPENVSWITCH" |
79 |
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
80 |
- kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 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 ist 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 |
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
127 |
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" || die |
128 |
- python_foreach_impl python_doscript utilities/"${SCRIPT}" |
129 |
- done |
130 |
- |
131 |
- python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor |
132 |
- |
133 |
- rm -r "${ED%/}"/usr/share/openvswitch/python || die |
134 |
- |
135 |
- keepdir /var/{lib,log}/openvswitch |
136 |
- keepdir /etc/ssl/openvswitch |
137 |
- fperms 0750 /etc/ssl/openvswitch |
138 |
- |
139 |
- rm -rf "${ED%/}"/var/run || die |
140 |
- # monitor is statically enabled for bug 596206 |
141 |
- #if ! use monitor ; then |
142 |
- # rm -r "${ED%/}"/usr/share/ovsdbmonitor || die |
143 |
- #fi |
144 |
- |
145 |
- newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
146 |
- newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd |
147 |
- newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |
148 |
- newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd |
149 |
- |
150 |
- systemd_dounit "${FILESDIR}/ovsdb-server.service" |
151 |
- systemd_dounit "${FILESDIR}/ovs-vswitchd.service" |
152 |
- systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf |
153 |
- |
154 |
- insinto /etc/logrotate.d |
155 |
- newins rhel/etc_logrotate.d_openvswitch openvswitch |
156 |
- |
157 |
- use modules && linux-mod_src_install |
158 |
-} |
159 |
- |
160 |
-pkg_postinst() { |
161 |
- use modules && linux-mod_pkg_postinst |
162 |
- |
163 |
- local pv |
164 |
- for pv in ${REPLACING_VERSIONS}; do |
165 |
- if ! version_is_at_least 1.9.0 ${pv} ; then |
166 |
- ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from" |
167 |
- ewarn " /etc/openvswitch" |
168 |
- ewarn "to" |
169 |
- ewarn " /var/lib/openvswitch" |
170 |
- ewarn "Please copy/move the database manually before running the schema upgrade." |
171 |
- ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch" |
172 |
- fi |
173 |
- done |
174 |
- |
175 |
- elog "Use the following command to create an initial database for ovsdb-server:" |
176 |
- elog " emerge --config =${CATEGORY}/${PF}" |
177 |
- elog "(will create a database in /var/lib/openvswitch/conf.db)" |
178 |
- elog "or to convert the database to the current schema after upgrading." |
179 |
-} |
180 |
- |
181 |
-pkg_config() { |
182 |
- local db="${EROOT%/}"/var/lib/openvswitch/conf.db |
183 |
- if [[ -e "${db}" ]] ; then |
184 |
- einfo "Database '${db}' already exists, doing schema migration..." |
185 |
- einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
186 |
- ovsdb-tool convert "${db}" \ |
187 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" |
188 |
- else |
189 |
- einfo "Creating new database '${db}'..." |
190 |
- ovsdb-tool create "${db}" \ |
191 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" |
192 |
- fi |
193 |
-} |
194 |
|
195 |
diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild |
196 |
deleted file mode 100644 |
197 |
index fdc4e352f39..00000000000 |
198 |
--- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild |
199 |
+++ /dev/null |
200 |
@@ -1,167 +0,0 @@ |
201 |
-# Copyright 1999-2016 Gentoo Foundation |
202 |
-# Distributed under the terms of the GNU General Public License v2 |
203 |
- |
204 |
-EAPI=6 |
205 |
- |
206 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
207 |
- |
208 |
-inherit autotools eutils linux-info linux-mod python-r1 systemd |
209 |
- |
210 |
-DESCRIPTION="Production quality, multilayer virtual switch" |
211 |
-HOMEPAGE="http://openvswitch.org" |
212 |
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz" |
213 |
- |
214 |
-LICENSE="Apache-2.0 GPL-2" |
215 |
-SLOT="0" |
216 |
-KEYWORDS="amd64 ~arm64 x86" |
217 |
-IUSE="debug modules monitor +ssl" |
218 |
- |
219 |
-RDEPEND=" |
220 |
- || ( |
221 |
- >=sys-apps/openrc-0.10.5 |
222 |
- sys-apps/systemd |
223 |
- ) |
224 |
- ssl? ( dev-libs/openssl:0= ) |
225 |
- monitor? ( |
226 |
- ${PYTHON_DEPS} |
227 |
- dev-python/twisted-core |
228 |
- dev-python/twisted-conch |
229 |
- dev-python/twisted-web |
230 |
- dev-python/PyQt4[${PYTHON_USEDEP}] |
231 |
- dev-python/zope-interface[${PYTHON_USEDEP}] ) |
232 |
- debug? ( dev-lang/perl )" |
233 |
-DEPEND="${RDEPEND} |
234 |
- virtual/pkgconfig" |
235 |
- |
236 |
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
237 |
- |
238 |
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
239 |
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
240 |
-BUILD_TARGETS="all" |
241 |
- |
242 |
-pkg_setup() { |
243 |
- if use modules ; then |
244 |
- CONFIG_CHECK+=" ~!OPENVSWITCH" |
245 |
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
246 |
- kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
247 |
- linux-mod_pkg_setup |
248 |
- else |
249 |
- CONFIG_CHECK+=" ~OPENVSWITCH" |
250 |
- linux-info_pkg_setup |
251 |
- fi |
252 |
-} |
253 |
- |
254 |
-src_prepare() { |
255 |
- # Never build kernelmodules, doing this manually |
256 |
- sed -i \ |
257 |
- -e '/^SUBDIRS/d' \ |
258 |
- datapath/Makefile.in || die "sed failed" |
259 |
- eautoreconf |
260 |
- default |
261 |
-} |
262 |
- |
263 |
-src_configure() { |
264 |
- set_arch_to_kernel |
265 |
- use monitor || export ovs_cv_python="no" |
266 |
- #pyside is staticly disabled |
267 |
- export ovs_cv_pyuic4="no" |
268 |
- |
269 |
- local linux_config |
270 |
- use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
271 |
- |
272 |
- econf ${linux_config} \ |
273 |
- --with-rundir=/var/run/openvswitch \ |
274 |
- --with-logdir=/var/log/openvswitch \ |
275 |
- --with-pkidir=/etc/ssl/openvswitch \ |
276 |
- --with-dbdir=/var/lib/openvswitch \ |
277 |
- $(use_enable ssl) \ |
278 |
- $(use_enable !debug ndebug) |
279 |
-} |
280 |
- |
281 |
-src_compile() { |
282 |
- default |
283 |
- |
284 |
- use modules && linux-mod_src_compile |
285 |
-} |
286 |
- |
287 |
-src_install() { |
288 |
- default |
289 |
- |
290 |
- local SCRIPT |
291 |
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
292 |
- python_replicate_script utilities/"${SCRIPT}" |
293 |
- done |
294 |
- |
295 |
- if use monitor ; then |
296 |
- python_install() { |
297 |
- python_domodule "${ED%/}"/usr/share/openvswitch/python/* |
298 |
- python_optimize "${ED%/}"/usr/share/ovsdbmonitor |
299 |
- } |
300 |
- python_foreach_impl python_install |
301 |
- rm -r "${ED%/}"/usr/share/openvswitch/python || die |
302 |
- fi |
303 |
- # not working without the brcompat_mod kernel module which did not get |
304 |
- # included in the kernel and we can't build it anymore |
305 |
- rm "${ED%/}"/usr/sbin/ovs-brcompatd "${ED%/}"/usr/share/man/man8/ovs-brcompatd.8 || die |
306 |
- |
307 |
- keepdir /var/{lib,log}/openvswitch |
308 |
- keepdir /etc/ssl/openvswitch |
309 |
- fperms 0750 /etc/ssl/openvswitch |
310 |
- |
311 |
- rm -rf "${ED%/}"/var/run || die |
312 |
- if ! use monitor ; then |
313 |
- rm -r "${ED%/}"/usr/share/ovsdbmonitor || die |
314 |
- fi |
315 |
- if ! use debug ; then |
316 |
- rm "${ED%/}"/usr/bin/ovs-parse-leaks || die |
317 |
- fi |
318 |
- |
319 |
- newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
320 |
- newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd |
321 |
- newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |
322 |
- newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd |
323 |
- |
324 |
- systemd_dounit "${FILESDIR}/ovsdb-server.service" |
325 |
- systemd_dounit "${FILESDIR}/ovs-vswitchd.service" |
326 |
- systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf |
327 |
- |
328 |
- insinto /etc/logrotate.d |
329 |
- newins rhel/etc_logrotate.d_openvswitch openvswitch |
330 |
- |
331 |
- use modules && linux-mod_src_install |
332 |
-} |
333 |
- |
334 |
-pkg_postinst() { |
335 |
- use modules && linux-mod_pkg_postinst |
336 |
- |
337 |
- local pv |
338 |
- for pv in ${REPLACING_VERSIONS}; do |
339 |
- if ! version_is_at_least 1.9.0 ${pv} ; then |
340 |
- ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from" |
341 |
- ewarn " /etc/openvswitch" |
342 |
- ewarn "to" |
343 |
- ewarn " /var/lib/openvswitch" |
344 |
- ewarn "Please copy/move the database manually before running the schema upgrade." |
345 |
- ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch" |
346 |
- fi |
347 |
- done |
348 |
- |
349 |
- elog "Use the following command to create an initial database for ovsdb-server:" |
350 |
- elog " emerge --config =${CATEGORY}/${PF}" |
351 |
- elog "(will create a database in /var/lib/openvswitch/conf.db)" |
352 |
- elog "or to convert the database to the current schema after upgrading." |
353 |
-} |
354 |
- |
355 |
-pkg_config() { |
356 |
- local db="${EROOT%/}"/var/lib/openvswitch/conf.db |
357 |
- if [[ -e "${db}" ]] ; then |
358 |
- einfo "Database '${db}' already exists, doing schema migration..." |
359 |
- einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
360 |
- ovsdb-tool convert "${db}" \ |
361 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" |
362 |
- else |
363 |
- einfo "Creating new database '${db}'..." |
364 |
- ovsdb-tool create "${db}" \ |
365 |
- "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" |
366 |
- fi |
367 |
-} |