From 3e6a1bec34621d4c5a6830e6fa27852c89e21002 Mon Sep 17 00:00:00 2001 From: ikerbs Date: Fri, 11 Dec 2020 02:07:15 +0300 Subject: [PATCH] update openvswitch, tuned, python-linux-procfs packages --- .../python-linux-procfs-0.6.1-r1.ebuild | 19 +++ .../openvswitch/openvswitch-2.13.0-r2.ebuild | 146 ++++++++++++++++++ .../openvswitch/openvswitch-2.13.1.ebuild | 146 ++++++++++++++++++ sys-apps/tuned/tuned-2.13.0-r2.ebuild | 61 ++++++++ 4 files changed, 372 insertions(+) create mode 100644 dev-python/python-linux-procfs/python-linux-procfs-0.6.1-r1.ebuild create mode 100644 net-misc/openvswitch/openvswitch-2.13.0-r2.ebuild create mode 100644 net-misc/openvswitch/openvswitch-2.13.1.ebuild create mode 100644 sys-apps/tuned/tuned-2.13.0-r2.ebuild diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.6.1-r1.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.6.1-r1.ebuild new file mode 100644 index 0000000..bc80896 --- /dev/null +++ b/dev-python/python-linux-procfs/python-linux-procfs-0.6.1-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit distutils-r1 + +DESCRIPTION="Python classes to extract information from the Linux kernel /proc files" +HOMEPAGE="https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/ + https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/" +SRC_URI="https://cdn.kernel.org/pub/software/libs/python/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-python/six[${PYTHON_USEDEP}]" diff --git a/net-misc/openvswitch/openvswitch-2.13.0-r2.ebuild b/net-misc/openvswitch/openvswitch-2.13.0-r2.ebuild new file mode 100644 index 0000000..9476ef3 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.13.0-r2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="https://www.openvswitch.org" +SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="debug modules monitor +ssl" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-2.13.0[${PYTHON_USEDEP}] + dev-python/twisted[conch,${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + debug? ( dev-lang/perl )" +DEPEND="${RDEPEND} + sys-apps/util-linux[caps] + virtual/pkgconfig" + +PATCHES=" + "${FILESDIR}/xcp-interface-reconfigure-2.3.2.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" + # docs state 4.17.x code states 4.15.x + kernel_is le 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 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" + + # flake8 is primarily a style guide tool, running it as part of the tests + # in Gentoo does not make much sense, only breaks them: bug 607280 + export ovs_cv_flake8="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.confd-r2" ovs-vswitchd + newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server + newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd + + systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service + systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service + systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.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 + + # only needed on non-systemd, but helps anyway + 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 +} diff --git a/net-misc/openvswitch/openvswitch-2.13.1.ebuild b/net-misc/openvswitch/openvswitch-2.13.1.ebuild new file mode 100644 index 0000000..9476ef3 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.13.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="https://www.openvswitch.org" +SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="debug modules monitor +ssl" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-2.13.0[${PYTHON_USEDEP}] + dev-python/twisted[conch,${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + debug? ( dev-lang/perl )" +DEPEND="${RDEPEND} + sys-apps/util-linux[caps] + virtual/pkgconfig" + +PATCHES=" + "${FILESDIR}/xcp-interface-reconfigure-2.3.2.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" + # docs state 4.17.x code states 4.15.x + kernel_is le 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 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" + + # flake8 is primarily a style guide tool, running it as part of the tests + # in Gentoo does not make much sense, only breaks them: bug 607280 + export ovs_cv_flake8="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.confd-r2" ovs-vswitchd + newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server + newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd + + systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service + systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service + systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.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 + + # only needed on non-systemd, but helps anyway + 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 +} diff --git a/sys-apps/tuned/tuned-2.13.0-r2.ebuild b/sys-apps/tuned/tuned-2.13.0-r2.ebuild new file mode 100644 index 0000000..5483ba5 --- /dev/null +++ b/sys-apps/tuned/tuned-2.13.0-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit python-single-r1 xdg-utils + +DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices" +HOMEPAGE="https://github.com/redhat-performance/tuned" +SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/configobj[${PYTHON_MULTI_USEDEP}] + dev-python/decorator[${PYTHON_MULTI_USEDEP}] + dev-python/pyudev[${PYTHON_MULTI_USEDEP}] + dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/python-linux-procfs[${PYTHON_MULTI_USEDEP}] + ')" + +RDEPEND=" + ${DEPEND} + sys-apps/dbus + sys-apps/ethtool + sys-power/powertop + dev-util/systemtap" + +RESTRICT="test" + +src_prepare() { + default + + sed -i \ + -e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \ + -e "/\$(DESTDIR)\/run\/tuned/d" \ + -e "/\$(DESTDIR)\/var\/lib\/tuned/d" \ + -e "/\$(DESTDIR)\/var\/log\/tuned/d" \ + Makefile || die +} + +src_install() { + default + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + python_fix_shebang "${D}" + python_optimize +} + +pkg_postinst() { + xdg_icon_cache_update +}