Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openvswitch: openvswitch-2.3.2.ebuild ChangeLog
Date: Wed, 29 Jul 2015 22:36:48
Message-Id: 20150729223621.29B88EE@oystercatcher.gentoo.org
1 prometheanfire 15/07/29 22:36:21
2
3 Modified: ChangeLog
4 Added: openvswitch-2.3.2.ebuild
5 Log:
6 bup
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
9
10 Revision Changes Path
11 1.31 net-misc/openvswitch/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/ChangeLog?rev=1.31&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/ChangeLog?rev=1.31&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/ChangeLog?r1=1.30&r2=1.31
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v
20 retrieving revision 1.30
21 retrieving revision 1.31
22 diff -u -r1.30 -r1.31
23 --- ChangeLog 29 Jul 2015 17:50:11 -0000 1.30
24 +++ ChangeLog 29 Jul 2015 22:36:21 -0000 1.31
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-misc/openvswitch
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.30 2015/07/29 17:50:11 zlogene Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.31 2015/07/29 22:36:21 prometheanfire Exp $
30 +
31 +*openvswitch-2.3.2 (29 Jul 2015)
32 +
33 + 29 Jul 2015; Matthew Thode <prometheanfire@g.o>
34 + +files/xcp-interface-reconfigure-2.3.2.patch, +openvswitch-2.3.2.ebuild:
35 + bup
36
37 29 Jul 2015; Mikle Kolyada <zlogene@g.o> openvswitch-2.3.1.ebuild:
38 x86 stable wrt bug #554284
39
40
41
42 1.1 net-misc/openvswitch/openvswitch-2.3.2.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/openvswitch-2.3.2.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvswitch/openvswitch-2.3.2.ebuild?rev=1.1&content-type=text/plain
46
47 Index: openvswitch-2.3.2.ebuild
48 ===================================================================
49 # Copyright 1999-2015 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.3.2.ebuild,v 1.1 2015/07/29 22:36:21 prometheanfire Exp $
52
53 EAPI=5
54
55 PYTHON_COMPAT=( python2_7 )
56
57 inherit eutils linux-info linux-mod python-single-r1 systemd autotools
58
59 DESCRIPTION="Production quality, multilayer virtual switch"
60 HOMEPAGE="http://openvswitch.org"
61 SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
62
63 LICENSE="Apache-2.0 GPL-2"
64 SLOT="0"
65 KEYWORDS="~amd64 ~x86"
66 IUSE="debug modules monitor +ssl"
67
68 RDEPEND=">=sys-apps/openrc-0.10.5
69 ssl? ( dev-libs/openssl:= )
70 monitor? (
71 ${PYTHON_DEPS}
72 dev-python/twisted-core
73 dev-python/twisted-conch
74 dev-python/twisted-web
75 dev-python/PyQt4[${PYTHON_USEDEP}]
76 dev-python/zope-interface[${PYTHON_USEDEP}] )
77 debug? ( dev-lang/perl )"
78 DEPEND="${RDEPEND}
79 virtual/pkgconfig"
80
81 CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
82 MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
83 BUILD_TARGETS="all"
84
85 pkg_setup() {
86 if use modules ; then
87 CONFIG_CHECK+=" ~!OPENVSWITCH"
88 kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 3.14 required for userspace modules"
89 kernel_is le 3 14 || die "Linux >= 2.6.32 and <= 3.14 required for userspace modules"
90 linux-mod_pkg_setup
91 else
92 CONFIG_CHECK+=" ~OPENVSWITCH"
93 linux-info_pkg_setup
94 fi
95 use monitor && python-single-r1_pkg_setup
96 }
97
98 src_prepare() {
99 # Never build kernelmodules, doing this manually
100 sed -i \
101 -e '/^SUBDIRS/d' \
102 datapath/Makefile.in || die "sed failed"
103 epatch "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
104 eautoreconf
105 }
106 src_configure() {
107 set_arch_to_kernel
108 use monitor || export ovs_cv_python="no"
109 #pyside is staticly disabled
110 export ovs_cv_pyuic4="no"
111
112 local linux_config
113 use modules && linux_config="--with-linux=${KV_OUT_DIR}"
114
115 PYTHON=python2.7 econf ${linux_config} \
116 --with-rundir=/var/run/openvswitch \
117 --with-logdir=/var/log/openvswitch \
118 --with-pkidir=/etc/ssl/openvswitch \
119 --with-dbdir=/var/lib/openvswitch \
120 $(use_enable ssl) \
121 $(use_enable !debug ndebug)
122 }
123
124 src_compile() {
125 default
126
127 # use monitor && python_fix_shebang \
128 # utilities/ovs-{pcap,tcpundump,test,vlan-test} \
129 # utilities/bugtool/ovs-bugtool
130 if use monitor; then
131 sed -i \
132 's/^#\!\ python2\.7/#\!\/usr\/bin\/env\ python2\.7/' \
133 utilities/ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} \
134 utilities/bugtool/ovs-bugtool || die "sed died :("
135 fi
136
137 use modules && linux-mod_src_compile
138 }
139
140 src_install() {
141 default
142
143 if use monitor ; then
144 python_domodule "${ED}"/usr/share/openvswitch/python/*
145 rm -r "${ED}/usr/share/openvswitch/python"
146 python_optimize "${ED}/usr/share/ovsdbmonitor"
147 fi
148 # not working without the brcompat_mod kernel module which did not get
149 # included in the kernel and we can't build it anymore
150 rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8"
151
152 keepdir /var/{lib,log}/openvswitch
153 keepdir /etc/ssl/openvswitch
154 fperms 0750 /etc/ssl/openvswitch
155
156 rm -rf "${ED}/var/run"
157 use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
158 use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
159
160 newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
161 newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
162 newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
163 newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
164
165 systemd_dounit "${FILESDIR}/ovsdb-server.service"
166 systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
167 systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
168
169 insinto /etc/logrotate.d
170 newins rhel/etc_logrotate.d_openvswitch openvswitch
171
172 use modules && linux-mod_src_install
173 }
174
175 pkg_postinst() {
176 use modules && linux-mod_pkg_postinst
177
178 for pv in ${REPLACING_VERSIONS}; do
179 if ! version_is_at_least 1.9.0 ${pv} ; then
180 ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
181 ewarn " /etc/openvswitch"
182 ewarn "to"
183 ewarn " /var/lib/openvswitch"
184 ewarn "Please copy/move the database manually before running the schema upgrade."
185 ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
186 fi
187 done
188
189 elog "Use the following command to create an initial database for ovsdb-server:"
190 elog " emerge --config =${CATEGORY}/${PF}"
191 elog "(will create a database in /var/lib/openvswitch/conf.db)"
192 elog "or to convert the database to the current schema after upgrading."
193 }
194
195 pkg_config() {
196 local db="${EPREFIX}/var/lib/openvswitch/conf.db"
197 if [ -e "${db}" ] ; then
198 einfo "Database '${db}' already exists, doing schema migration..."
199 einfo "(if the migration fails, make sure that ovsdb-server is not running)"
200 "${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
201 else
202 einfo "Creating new database '${db}'..."
203 "${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
204 fi
205 }
Report Message
Find on MARC Find on Google Groups