1 |
commit: a660ae14eab8752fbcb71f2d86f259eaddfe9447 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 22 11:54:12 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 22 12:00:58 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a660ae14 |
7 |
|
8 |
net-misc/openvswitch: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
net-misc/openvswitch/Manifest | 1 - |
13 |
.../files/ovs-delete-transient-ports.service | 10 -- |
14 |
net-misc/openvswitch/files/ovs-vswitchd.service | 15 --- |
15 |
net-misc/openvswitch/files/ovsdb-server.service | 14 -- |
16 |
net-misc/openvswitch/files/ovsdb-server_conf | 16 --- |
17 |
net-misc/openvswitch/openvswitch-2.14.1.ebuild | 147 --------------------- |
18 |
6 files changed, 203 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest |
21 |
index cc9e42bfb518..70ff24911853 100644 |
22 |
--- a/net-misc/openvswitch/Manifest |
23 |
+++ b/net-misc/openvswitch/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b |
26 |
DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 |
27 |
|
28 |
diff --git a/net-misc/openvswitch/files/ovs-delete-transient-ports.service b/net-misc/openvswitch/files/ovs-delete-transient-ports.service |
29 |
deleted file mode 100644 |
30 |
index 4cd4d7f57f97..000000000000 |
31 |
--- a/net-misc/openvswitch/files/ovs-delete-transient-ports.service |
32 |
+++ /dev/null |
33 |
@@ -1,10 +0,0 @@ |
34 |
-[Unit] |
35 |
-Description=Open vSwitch Delete Transient Ports |
36 |
-After=ovsdb-server.service |
37 |
-Before=ovs-vswitchd.service |
38 |
-AssertPathExists=/var/run/openvswitch/db.sock |
39 |
- |
40 |
-[Service] |
41 |
-Type=oneshot |
42 |
-RemainAfterExit=yes |
43 |
-ExecStart=/usr/share/openvswitch/scripts/ovs-ctl delete-transient-ports |
44 |
|
45 |
diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service |
46 |
deleted file mode 100644 |
47 |
index a573a503e14c..000000000000 |
48 |
--- a/net-misc/openvswitch/files/ovs-vswitchd.service |
49 |
+++ /dev/null |
50 |
@@ -1,15 +0,0 @@ |
51 |
-[Unit] |
52 |
-Description=Open vSwitch Daemon |
53 |
-Documentation=man:ovs-vswitchd |
54 |
-Wants=network.target |
55 |
-Before=network.target |
56 |
-Requires=ovsdb-server.service |
57 |
-After=ovsdb-server.service |
58 |
- |
59 |
-[Service] |
60 |
-# --pidfile options is needed for create file used |
61 |
-# by ovs-appctl command. |
62 |
-ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock --pidfile |
63 |
- |
64 |
-[Install] |
65 |
-WantedBy=multi-user.target |
66 |
|
67 |
diff --git a/net-misc/openvswitch/files/ovsdb-server.service b/net-misc/openvswitch/files/ovsdb-server.service |
68 |
deleted file mode 100644 |
69 |
index 9493c40755d8..000000000000 |
70 |
--- a/net-misc/openvswitch/files/ovsdb-server.service |
71 |
+++ /dev/null |
72 |
@@ -1,14 +0,0 @@ |
73 |
-[Unit] |
74 |
-Description=Open vSwitch Database Server |
75 |
-Documentation=man:ovsdb-server |
76 |
- |
77 |
-[Service] |
78 |
-# The file can be shared for this as this values are prone to change |
79 |
-# and that way we don't need to update them in two different places |
80 |
-EnvironmentFile=/etc/conf.d/ovsdb-server |
81 |
-ExecStart=/usr/sbin/ovsdb-server --monitor \ |
82 |
- --remote=punix:${DB_SOCKET} \ |
83 |
- --remote=${REMOTE_DB} \ |
84 |
- --private-key=${PRIVATE_KEY} \ |
85 |
- --certificate=${CERTIFICATE} \ |
86 |
- --bootstrap-ca-cert=${BOOTSTRAP_CA_CERT} |
87 |
|
88 |
diff --git a/net-misc/openvswitch/files/ovsdb-server_conf b/net-misc/openvswitch/files/ovsdb-server_conf |
89 |
deleted file mode 100644 |
90 |
index 1299b820640c..000000000000 |
91 |
--- a/net-misc/openvswitch/files/ovsdb-server_conf |
92 |
+++ /dev/null |
93 |
@@ -1,16 +0,0 @@ |
94 |
-# Socket for bringing the server up |
95 |
-DB_SOCKET="/var/run/openvswitch/db.sock" |
96 |
- |
97 |
-# Remote sockets are defined in the database by default |
98 |
-REMOTE_DB="db:Open_vSwitch,manager_options" |
99 |
- |
100 |
-# All certificates and keys are stored in the database (if any) |
101 |
-PRIVATE_KEY="db:SSL,private_key" |
102 |
-CERTIFICATE="db:SSL,certificate" |
103 |
-BOOTSTRAP_CA_CERT="db:SSL,ca_cert" |
104 |
- |
105 |
-# Alternative path for the database (default is /etc/openvswitch/conf.db) |
106 |
-# DATABASE="/etc/openvswitch/conf.db" |
107 |
- |
108 |
-# Additional options |
109 |
-# OPTIONS="" |
110 |
|
111 |
diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild |
112 |
deleted file mode 100644 |
113 |
index c873cc5a5478..000000000000 |
114 |
--- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,147 +0,0 @@ |
117 |
-# Copyright 1999-2021 Gentoo Authors |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=7 |
121 |
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) |
122 |
- |
123 |
-inherit autotools linux-info linux-mod python-r1 systemd tmpfiles |
124 |
- |
125 |
-DESCRIPTION="Production quality, multilayer virtual switch" |
126 |
-HOMEPAGE="https://www.openvswitch.org" |
127 |
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" |
128 |
- |
129 |
-LICENSE="Apache-2.0 GPL-2" |
130 |
-SLOT="0" |
131 |
-KEYWORDS="amd64 ~arm64 x86" |
132 |
-IUSE="debug modules monitor +ssl" |
133 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
134 |
- |
135 |
-RDEPEND=" |
136 |
- ssl? ( dev-libs/openssl:0= ) |
137 |
- ${PYTHON_DEPS} |
138 |
- ~dev-python/ovs-2.13.0[${PYTHON_USEDEP}] |
139 |
- dev-python/twisted[conch,${PYTHON_USEDEP}] |
140 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
141 |
- debug? ( dev-lang/perl )" |
142 |
-DEPEND="${RDEPEND} |
143 |
- sys-apps/util-linux[caps]" |
144 |
-BDEPEND="virtual/pkgconfig" |
145 |
- |
146 |
-PATCHES=" |
147 |
- "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
148 |
-" |
149 |
- |
150 |
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
151 |
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
152 |
-BUILD_TARGETS="all" |
153 |
- |
154 |
-pkg_setup() { |
155 |
- if use modules ; then |
156 |
- CONFIG_CHECK+=" ~!OPENVSWITCH" |
157 |
- kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" |
158 |
- # docs state 4.17.x code states 4.15.x |
159 |
- kernel_is le 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules" |
160 |
- linux-mod_pkg_setup |
161 |
- else |
162 |
- CONFIG_CHECK+=" ~OPENVSWITCH" |
163 |
- linux-info_pkg_setup |
164 |
- fi |
165 |
-} |
166 |
- |
167 |
-src_prepare() { |
168 |
- # Never build kernelmodules, doing this manually |
169 |
- sed -i \ |
170 |
- -e '/^SUBDIRS/d' \ |
171 |
- datapath/Makefile.in || die "sed failed" |
172 |
- eautoreconf |
173 |
- default |
174 |
-} |
175 |
- |
176 |
-src_configure() { |
177 |
- set_arch_to_kernel |
178 |
- # monitor is statically enabled for bug 596206 |
179 |
- # use monitor || export ovs_cv_python="no" |
180 |
- # pyside is staticly disabled |
181 |
- export ovs_cv_pyuic4="no" |
182 |
- |
183 |
- # flake8 is primarily a style guide tool, running it as part of the tests |
184 |
- # in Gentoo does not make much sense, only breaks them: bug 607280 |
185 |
- export ovs_cv_flake8="no" |
186 |
- |
187 |
- local linux_config |
188 |
- use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
189 |
- |
190 |
- econf ${linux_config} \ |
191 |
- --with-rundir=/var/run/openvswitch \ |
192 |
- --with-logdir=/var/log/openvswitch \ |
193 |
- --with-pkidir=/etc/ssl/openvswitch \ |
194 |
- --with-dbdir=/var/lib/openvswitch \ |
195 |
- $(use_enable ssl) \ |
196 |
- $(use_enable !debug ndebug) |
197 |
-} |
198 |
- |
199 |
-src_compile() { |
200 |
- default |
201 |
- |
202 |
- use modules && linux-mod_src_compile |
203 |
-} |
204 |
- |
205 |
-src_install() { |
206 |
- default |
207 |
- |
208 |
- local SCRIPT |
209 |
- if use monitor; then |
210 |
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do |
211 |
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" |
212 |
- python_foreach_impl python_doscript utilities/"${SCRIPT}" |
213 |
- done |
214 |
- rm -r "${ED}"/usr/share/openvswitch/python || die |
215 |
- fi |
216 |
- |
217 |
- keepdir /var/{lib,log}/openvswitch |
218 |
- keepdir /etc/ssl/openvswitch |
219 |
- fperms 0750 /etc/ssl/openvswitch |
220 |
- |
221 |
- rm -rf "${ED}"/var/run || die |
222 |
- |
223 |
- newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server |
224 |
- newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd |
225 |
- newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server |
226 |
- newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd |
227 |
- |
228 |
- systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service |
229 |
- systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service |
230 |
- systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service |
231 |
- newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf |
232 |
- |
233 |
- insinto /etc/logrotate.d |
234 |
- newins rhel/etc_logrotate.d_openvswitch openvswitch |
235 |
- |
236 |
- use modules && linux-mod_src_install |
237 |
-} |
238 |
- |
239 |
-pkg_postinst() { |
240 |
- use modules && linux-mod_pkg_postinst |
241 |
- |
242 |
- tmpfiles_process openvswitch.conf |
243 |
- |
244 |
- # only needed on non-systemd, but helps anyway |
245 |
- elog "Use the following command to create an initial database for ovsdb-server:" |
246 |
- elog " emerge --config =${CATEGORY}/${PF}" |
247 |
- elog "(will create a database in /var/lib/openvswitch/conf.db)" |
248 |
- elog "or to convert the database to the current schema after upgrading." |
249 |
-} |
250 |
- |
251 |
-pkg_config() { |
252 |
- local db="${EROOT%}"/var/lib/openvswitch/conf.db |
253 |
- if [[ -e "${db}" ]] ; then |
254 |
- einfo "Database '${db}' already exists, doing schema migration..." |
255 |
- einfo "(if the migration fails, make sure that ovsdb-server is not running)" |
256 |
- ovsdb-tool convert "${db}" \ |
257 |
- "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" |
258 |
- else |
259 |
- einfo "Creating new database '${db}'..." |
260 |
- ovsdb-tool create "${db}" \ |
261 |
- "${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" |
262 |
- fi |
263 |
-} |