From 4f92e08f81f3f0fcc27b168fa4991702a377553f Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 14 Dec 2013 13:06:53 +0000 Subject: Add unit files (#492390) (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) --- net-misc/openvswitch/ChangeLog | 9 +- net-misc/openvswitch/files/openvswitch.tmpfiles | 1 + net-misc/openvswitch/files/ovs-controller.service | 9 ++ net-misc/openvswitch/files/ovs-vswitchd.service | 13 ++ net-misc/openvswitch/files/ovsdb-server.service | 14 ++ net-misc/openvswitch/openvswitch-2.0.0-r1.ebuild | 154 ++++++++++++++++++++++ 6 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 net-misc/openvswitch/files/openvswitch.tmpfiles create mode 100644 net-misc/openvswitch/files/ovs-controller.service create mode 100644 net-misc/openvswitch/files/ovs-vswitchd.service create mode 100644 net-misc/openvswitch/files/ovsdb-server.service create mode 100644 net-misc/openvswitch/openvswitch-2.0.0-r1.ebuild (limited to 'net-misc/openvswitch') diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog index edc3ff5a4d66..3045459c4b1c 100644 --- a/net-misc/openvswitch/ChangeLog +++ b/net-misc/openvswitch/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/openvswitch # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.19 2013/12/11 03:44:39 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.20 2013/12/14 13:06:53 pacho Exp $ + +*openvswitch-2.0.0-r1 (14 Dec 2013) + + 14 Dec 2013; Pacho Ramos +files/openvswitch.tmpfiles, + +files/ovs-controller.service, +files/ovs-vswitchd.service, + +files/ovsdb-server.service, +openvswitch-2.0.0-r1.ebuild: + Add unit files (#492390) 11 Dec 2013; Matthew Thode files/ovsdb-server_conf2: diff --git a/net-misc/openvswitch/files/openvswitch.tmpfiles b/net-misc/openvswitch/files/openvswitch.tmpfiles new file mode 100644 index 000000000000..58c583ee4747 --- /dev/null +++ b/net-misc/openvswitch/files/openvswitch.tmpfiles @@ -0,0 +1 @@ +d /var/run/openvswitch 0770 root root - diff --git a/net-misc/openvswitch/files/ovs-controller.service b/net-misc/openvswitch/files/ovs-controller.service new file mode 100644 index 000000000000..723c5caa1f6e --- /dev/null +++ b/net-misc/openvswitch/files/ovs-controller.service @@ -0,0 +1,9 @@ +[Unit] +Description=Open vSwitch OpenFlow controller +Requires=network.target + +[Service] +ExecStart=/usr/bin/ovs-controller --monitor ptcp: + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service new file mode 100644 index 000000000000..266bb0ace884 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-vswitchd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Open vSwitch Daemon +Documentation=man:ovs-vswitchd +Wants=network.target +Before=network.target +Requires=ovsdb-server.service +After=ovsdb-server.service + +[Service] +ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/openvswitch/files/ovsdb-server.service b/net-misc/openvswitch/files/ovsdb-server.service new file mode 100644 index 000000000000..9493c40755d8 --- /dev/null +++ b/net-misc/openvswitch/files/ovsdb-server.service @@ -0,0 +1,14 @@ +[Unit] +Description=Open vSwitch Database Server +Documentation=man:ovsdb-server + +[Service] +# The file can be shared for this as this values are prone to change +# and that way we don't need to update them in two different places +EnvironmentFile=/etc/conf.d/ovsdb-server +ExecStart=/usr/sbin/ovsdb-server --monitor \ + --remote=punix:${DB_SOCKET} \ + --remote=${REMOTE_DB} \ + --private-key=${PRIVATE_KEY} \ + --certificate=${CERTIFICATE} \ + --bootstrap-ca-cert=${BOOTSTRAP_CA_CERT} diff --git a/net-misc/openvswitch/openvswitch-2.0.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.0.0-r1.ebuild new file mode 100644 index 000000000000..d4391ba7e8a2 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.0.0-r1.ebuild @@ -0,0 +1,154 @@ +# 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-2.0.0-r1.ebuild,v 1.1 2013/12/14 13:06:53 pacho Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils linux-info linux-mod python-single-r1 systemd + +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 ~x86" +IUSE="debug modules monitor +pyside +ssl" + +RDEPEND=">=sys-apps/openrc-0.10.5 + ssl? ( dev-libs/openssl ) + monitor? ( + ${PYTHON_DEPS} + dev-python/twisted-core + 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="openvswitch(net:${S}/datapath/linux)" +BUILD_TARGETS="all" + +pkg_setup() { + if use modules ; then + CONFIG_CHECK+=" ~!OPENVSWITCH" + kernel_is ge 2 6 32 || die "Linux >=2.6.32 and <3.10 required" + kernel_is lt 3 11 || die "Linux >=2.6.18 and <3.11 required" + 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" + epatch "${FILESDIR}/prevent-traceback.patch" +} +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_conf2" 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 + + systemd_dounit "${FILESDIR}/ovsdb-server.service" + systemd_dounit "${FILESDIR}/ovs-vswitchd.service" + systemd_dounit "${FILESDIR}/ovs-controller.service" + systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf + + 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 +} -- cgit v1.2.3-65-gdbad