commit: 81a509bcc3fb98c2b5f3d3e323f26ce92a5ae138 Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Thu Feb 8 19:44:21 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Mar 4 07:53:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a509bc
net-misc/openvswitch: add 2.17.8 Updating to latest LTS release and fixing build error with GCC 14 Closes: https://bugs.gentoo.org/923703 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35235 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-misc/openvswitch/Manifest | 1 + .../files/openvswitch-2.17.8-gcc14-build-fix.patch | 32 ++++ net-misc/openvswitch/openvswitch-2.17.8.ebuild | 174 +++++++++++++++++++++ 3 files changed, 207 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 3bebee2ed69e..7acfe647114a 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1 +1,2 @@ DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 +DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 diff --git a/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch new file mode 100644 index 000000000000..6a439dc0544a --- /dev/null +++ b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch @@ -0,0 +1,32 @@ +https://github.com/openvswitch/ovs/commit/335a5deac3ff91448ca14651e92f39dfdd512fcf.patch +From: Ilya Maximets <[email protected]> +Date: Thu, 18 Jan 2024 15:59:05 +0100 +Subject: [PATCH] ovs-atomic: Fix inclusion of Clang header by GCC 14. + +GCC 14 started to advertise c_atomic extension, older versions didn't +do that. Add check for __clang__, so GCC doesn't include headers +designed for Clang. + +Another option would be to prefer stdatomic implementation instead, +but some older versions of Clang are not able to use stdatomic.h +supplied by GCC as described in commit: + 07ece367fb5f ("ovs-atomic: Prefer Clang intrinsics over <stdatomic.h>.") + +This change fixes OVS build with GCC on Fedora Rawhide (40). + +Reported-by: Jakob Meng <[email protected]> +Acked-by: Jakob Meng <[email protected]> +Acked-by: Eelco Chaudron <[email protected]> +Acked-by: Simon Horman <[email protected]> +Signed-off-by: Ilya Maximets <[email protected]> +--- a/lib/ovs-atomic.h ++++ b/lib/ovs-atomic.h +@@ -328,7 +328,7 @@ + #if __CHECKER__ + /* sparse doesn't understand some GCC extensions we use. */ + #include "ovs-atomic-pthreads.h" +- #elif __has_extension(c_atomic) ++ #elif __clang__ && __has_extension(c_atomic) + #include "ovs-atomic-clang.h" + #elif HAVE_ATOMIC && __cplusplus >= 201103L + #include "ovs-atomic-c++.h" diff --git a/net-misc/openvswitch/openvswitch-2.17.8.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild new file mode 100644 index 000000000000..059ccf3295d6 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_USE="modules" +PYTHON_COMPAT=( python3_{10..11} ) + +inherit autotools linux-mod python-single-r1 systemd tmpfiles + +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 ~ppc64 ~x86" +IUSE="debug modules monitor +ssl unwind valgrind" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Check python/ovs/version.py in tarball for dev-python/ovs dep +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + ') + debug? ( dev-lang/perl ) + unwind? ( sys-libs/libunwind:= ) + ssl? ( dev-libs/openssl:= )" +DEPEND="${RDEPEND} + sys-apps/util-linux[caps] + valgrind? ( dev-debug/valgrind )" +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" + +PATCHES=( + "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + "${FILESDIR}/${PN}-2.17.8-gcc14-build-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 <= 5.8 required for userspace modules" + kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" + linux-mod_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi +} + +src_prepare() { + default + + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" + + eautoreconf +} + +src_configure() { + set_arch_to_kernel + python_setup + + # 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" + + # Only adds a diagram to the man page, just skip it as we don't + # want to add a BDEPEND on graphviz right now. bug #856286 + export ovs_cv_dot="no" + + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + + local linux_config + use modules && linux_config="--with-linux=${KV_OUT_DIR}" + + export ac_cv_lib_unwind_unw_backtrace="$(usex unwind)" + + # Need PYTHON3 variable for bug #860240 + PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \ + --with-rundir=/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 + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do + 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 + newtmpfiles "${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 + + tmpfiles_process openvswitch.conf + + # 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 +}
