diff options
| -rw-r--r-- | net-misc/openvswitch/ChangeLog | 15 | ||||
| -rw-r--r-- | net-misc/openvswitch/files/ovs-controller-r1 | 23 | ||||
| -rw-r--r-- | net-misc/openvswitch/files/ovs-vswitchd-r1 | 22 | ||||
| -rw-r--r-- | net-misc/openvswitch/files/ovsdb-server-r1 | 35 | ||||
| -rw-r--r-- | net-misc/openvswitch/openvswitch-1.9.0.ebuild | 146 |
5 files changed, 239 insertions, 2 deletions
diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog index 6ac7345aa1cb..f7fd79fee146 100644 --- a/net-misc/openvswitch/ChangeLog +++ b/net-misc/openvswitch/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-misc/openvswitch -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.4 2012/07/18 08:41:29 dev-zero Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.5 2013/04/08 19:37:58 dev-zero Exp $ + +*openvswitch-1.9.0 (08 Apr 2013) + + 08 Apr 2013; Tiziano Müller <dev-zero@gentoo.org> +files/ovs-controller-r1, + +files/ovs-vswitchd-r1, +files/ovsdb-server-r1, +openvswitch-1.9.0.ebuild: + Version bump to 1.9.0 (bug #443558). Configuration database moved to + /var/lib/openvswitch (which is a solution for bug #438862). initscript-rewrite + to follow new declarative style and fixed bug #447630. Moved PKI to + /etc/ssl/openvswitch and make sure the directory has sane permissions (Bug + #431744). Added modules USE flag to build the openvswitch and brcompat kernel + modules. *openvswitch-1.6.1-r2 (18 Jul 2012) diff --git a/net-misc/openvswitch/files/ovs-controller-r1 b/net-misc/openvswitch/files/ovs-controller-r1 new file mode 100644 index 000000000000..dea1f670b919 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-controller-r1 @@ -0,0 +1,23 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-controller-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $ + +description="Open vSwitch OpenFlow controller" + +command="/usr/bin/ovs-controller" +command_args=" + --pidfile + --detach + --monitor + ${OPTIONS} ${METHODS}" +pidfile="/var/run/openvswitch/ovs-controller.pid" + +depend() { + need net + use logger +} + +start_pre() { + checkpath -d "/var/run/openvswitch" -m 0750 +} diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r1 b/net-misc/openvswitch/files/ovs-vswitchd-r1 new file mode 100644 index 000000000000..6bf8bfc53c18 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-vswitchd-r1 @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-vswitchd-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $ + +description="Open vSwitch virtual switch" + +command="/usr/sbin/ovs-vswitchd" +command_args=" + --pidfile + --detach + --monitor + ${OPTIONS} ${DATABASE}" +pidfile="/var/run/openvswitch/ovs-vswitchd.pid" + +depend() { + use ovsdb-server logger +} + +start_pre() { + checkpath -d "/var/run/openvswitch" -m 0750 +} diff --git a/net-misc/openvswitch/files/ovsdb-server-r1 b/net-misc/openvswitch/files/ovsdb-server-r1 new file mode 100644 index 000000000000..53c27445396e --- /dev/null +++ b/net-misc/openvswitch/files/ovsdb-server-r1 @@ -0,0 +1,35 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovsdb-server-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $ + +description="Open vSwitch database server" + +remote_punix=${DB_SOCKET:+"--remote=punix:${DB_SOCKET}"} +remote_db=${REMOTE_DB:+"--remote=${REMOTE_DB}"} +private_key=${PRIVATE_KEY:+"--private-key=${PRIVATE_KEY}"} +certificate=${CERTIFICATE:+"--certificate=${CERTIFICATE}"} +bootstrap_ca_cert=${BOOTSTRAP_CA_CERT:+"--bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}"} + +command="/usr/sbin/ovsdb-server" +command_args=" + --pidfile + --detach + --monitor + ${remote_punix} + ${remote_db} + ${private_key} + ${certificate} + ${bootstrap_ca_cert} + ${DATABASE} + ${OPTIONS}" +pidfile="/var/run/openvswitch/ovsdb-server.pid" + +depend() { + need localmount + use logger +} + +start_pre() { + checkpath -d "/var/run/openvswitch" -m 0750 +} diff --git a/net-misc/openvswitch/openvswitch-1.9.0.ebuild b/net-misc/openvswitch/openvswitch-1.9.0.ebuild new file mode 100644 index 000000000000..d538d3d9a83b --- /dev/null +++ b/net-misc/openvswitch/openvswitch-1.9.0.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-1.9.0.ebuild,v 1.1 2013/04/08 19:37:58 dev-zero Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils linux-info linux-mod python-single-r1 + +DESCRIPTION="Production quality, multilayer virtual switch." +HOMEPAGE="http://openvswitch.org" +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug modules monitor +pyside +ssl" + +RDEPEND=">=sys-apps/openrc-0.10.5 + ssl? ( dev-libs/openssl ) + monitor? ( + ${PYTHON_DEPS} + dev-python/twisted + dev-python/twisted-conch + dev-python/twisted-web + pyside? ( dev-python/pyside[${PYTHON_USEDEP}] ) + !pyside? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) + net-zope/zope-interface[${PYTHON_USEDEP}] ) + debug? ( dev-lang/perl )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" +MODULE_NAMES="brcompat(net:${S}/datapath/linux) openvswitch(net:${S}/datapath/linux)" +BUILD_TARGETS="all" + +pkg_setup() { + if use modules ; then + CONFIG_CHECK+=" ~!OPENVSWITCH" + linux-mod_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi + use monitor && python-single-r1_pkg_setup +} + +src_prepare() { + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" +} +src_configure() { + set_arch_to_kernel + use monitor || export ovs_cv_python="no" + use pyside || export ovs_cv_pyuic4="no" + + local linux_config + use modules && linux_config="--with-linux=${KERNEL_DIR}" + + econf ${linux_config} \ + --with-rundir=/var/run/openvswitch \ + --with-logdir=/var/log/openvswitch \ + --with-pkidir=/etc/ssl/openvswitch \ + --with-dbdir=/var/lib/openvswitch \ + $(use_enable ssl) \ + $(use_enable !debug ndebug) +} + +src_compile() { + default + + use monitor && python_fix_shebang \ + utilities/ovs-{pcap,tcpundump,test,vlan-test} \ + utilities/bugtool/ovs-bugtool \ + ovsdb/ovsdbmonitor/ovsdbmonitor + + use modules && linux-mod_src_compile +} + +src_install() { + default + + if use monitor ; then + python_domodule "${ED}"/usr/share/openvswitch/python/* + rm -r "${ED}/usr/share/openvswitch/python" + python_optimize "${ED}/usr/share/ovsdbmonitor" + fi + # not working without the brcompat_mod kernel module which did not get + # included in the kernel and we can't build it anymore + rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8" + + keepdir /var/{lib,log}/openvswitch + keepdir /etc/ssl/openvswitch + fperms 0750 /etc/ssl/openvswitch + + rm -rf "${ED}/var/run" + use monitor || rmdir "${ED}/usr/share/ovsdbmonitor" + use debug || rm "${ED}/usr/bin/ovs-parse-leaks" + + newconfd "${FILESDIR}/ovsdb-server_conf" ovsdb-server + newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd + newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller + newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server + newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd + newinitd "${FILESDIR}/ovs-controller-r1" ovs-controller + + insinto /etc/logrotate.d + newins rhel/etc_logrotate.d_openvswitch openvswitch + + use modules && linux-mod_src_install +} + +pkg_postinst() { + use modules && linux-mod_pkg_postinst + + for pv in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 1.9.0 ${pv} ; then + ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from" + ewarn " /etc/openvswitch" + ewarn "to" + ewarn " /var/lib/openvswitch" + ewarn "Please copy/move the database manually before running the schema upgrade." + ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch" + fi + done + + elog "Use the following command to create an initial database for ovsdb-server:" + elog " emerge --config =${CATEGORY}/${PF}" + elog "(will create a database in /var/lib/openvswitch/conf.db)" + elog "or to convert the database to the current schema after upgrading." +} + +pkg_config() { + local db="${EPREFIX}/var/lib/openvswitch/conf.db" + if [ -e "${db}" ] ; then + einfo "Database '${db}' already exists, doing schema migration..." + einfo "(if the migration fails, make sure that ovsdb-server is not running)" + "${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed" + else + einfo "Creating new database '${db}'..." + "${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed" + fi +} |