From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2ECA139694 for ; Fri, 21 Apr 2017 19:33:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6944E0CDA; Fri, 21 Apr 2017 19:33:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84F7BE0CDA for ; Fri, 21 Apr 2017 19:33:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E588340AC7 for ; Fri, 21 Apr 2017 19:33:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B46117427 for ; Fri, 21 Apr 2017 19:33:13 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1492803165.3ebea21b30582a7b11f1e17717b106ea0c660ec6.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openvswitch/files/doc-fix.patch net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild X-VCS-Directories: net-misc/openvswitch/ net-misc/openvswitch/files/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 3ebea21b30582a7b11f1e17717b106ea0c660ec6 X-VCS-Branch: master Date: Fri, 21 Apr 2017 19:33:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 194d9a0c-2604-4a7d-bb84-86548c0a99b1 X-Archives-Hash: 38af0108613400682ed7ce2f18fb58ec commit: 3ebea21b30582a7b11f1e17717b106ea0c660ec6 Author: Matthew Thode gentoo org> AuthorDate: Fri Apr 21 19:32:45 2017 +0000 Commit: Matt Thode gentoo org> CommitDate: Fri Apr 21 19:32:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ebea21b net-misc/openvswitch: 2.7.0-r2 fixing bug 614520 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/openvswitch/files/doc-fix.patch | 16 +++ net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild | 151 +++++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/net-misc/openvswitch/files/doc-fix.patch b/net-misc/openvswitch/files/doc-fix.patch new file mode 100644 index 00000000000..1d6df01147e --- /dev/null +++ b/net-misc/openvswitch/files/doc-fix.patch @@ -0,0 +1,16 @@ +We might want to backport this if there are any releases with the Sphinx +docs present. +--- + Documentation/conf.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Documentation/conf.py b/Documentation/conf.py +index 49514ec..97f402e 100644 +--- a/Documentation/conf.py ++++ b/Documentation/conf.py +@@ -145,8 +145,6 @@ linkcheck_anchors = False + # + if use_ovs_theme: + html_theme = 'ovs' +-else: +- html_theme = 'default' diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild new file mode 100644 index 00000000000..4bcf09a7a4f --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-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 ~arm64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-${PV}[${PYTHON_USEDEP}] + dev-python/twisted[conch,${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + debug? ( dev-lang/perl )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch ${FILESDIR}/doc-fix.patch" + +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 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" + linux-mod_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi +} + +src_prepare() { + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" + eautoreconf + default +} + +src_configure() { + set_arch_to_kernel + # monitor is statically enabled for bug 596206 + use monitor || export ovs_cv_python="no" + # pyside is staticly disabled + export ovs_cv_pyuic4="no" + + local linux_config + use modules && linux_config="--with-linux=${KV_OUT_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 modules && linux-mod_src_compile +} + +src_install() { + default + + local SCRIPT + if use monitor; then + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do + sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" + python_foreach_impl python_doscript utilities/"${SCRIPT}" + done + rm -r "${ED%/}"/usr/share/openvswitch/python || die + fi + + keepdir /var/{lib,log}/openvswitch + keepdir /etc/ssl/openvswitch + fperms 0750 /etc/ssl/openvswitch + + rm -rf "${ED%/}"/var/run || die + + newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server + newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd + newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server + newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd + + systemd_dounit "${FILESDIR}/ovsdb-server.service" + systemd_dounit "${FILESDIR}/ovs-vswitchd.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 + + local pv + 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="${EROOT%/}"/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)" + ovsdb-tool convert "${db}" \ + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" + else + einfo "Creating new database '${db}'..." + ovsdb-tool create "${db}" \ + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" + fi +}