From patchwork Mon Nov 13 16:34:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1863291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZRgE1kjs; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4STZlS39gxz1yR8 for ; Tue, 14 Nov 2023 03:34:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9A5E8821B2; Mon, 13 Nov 2023 16:34:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9A5E8821B2 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZRgE1kjs X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eHehauFTN6WY; Mon, 13 Nov 2023 16:34:41 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id ABDEC82113; Mon, 13 Nov 2023 16:34:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org ABDEC82113 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 85CC6C0071; Mon, 13 Nov 2023 16:34:40 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 053E3C0032 for ; Mon, 13 Nov 2023 16:34:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D4955612F8 for ; Mon, 13 Nov 2023 16:34:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D4955612F8 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZRgE1kjs X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z4FKdiDo5wzI for ; Mon, 13 Nov 2023 16:34:37 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id B5A9260740 for ; Mon, 13 Nov 2023 16:34:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B5A9260740 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699893276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RurPcvd8kWB71O6l6fI8JnOZiLH876BnEnbpqEHsQR8=; b=ZRgE1kjs5R9quWZMID/kPtlA8DymDhEvQBOtlbCY2k2LGdOS+x54d9ikBHLJ4qpJGEYwEz pCnwqWoqgHV02s0O7CJZLiJtOPJ/EtStyCtpSebb+4HaYLHOJUnaSVhyu9ADVQBLTdFhEs MQYCdN88zOXwBQT70fpWrt+F+Z8ffZA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-sxU4qG4rO7mPRjQD0WfXTg-1; Mon, 13 Nov 2023 11:34:35 -0500 X-MC-Unique: sxU4qG4rO7mPRjQD0WfXTg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 162B0101A550; Mon, 13 Nov 2023 16:34:35 +0000 (UTC) Received: from dceara.remote.csb (unknown [10.39.194.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B376492BE0; Mon, 13 Nov 2023 16:34:33 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Mon, 13 Nov 2023 17:34:31 +0100 Message-Id: <20231113163431.806383-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn branch-22.06 v2] ovs: Bump submodule to use v3.0.5. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" It's better to use a release tag now that one is available. This also partially backports the similar commit from branch-23.09: commit 558da0cd21ad0172405f7d93c5d0e7533edbf653 Author: Ales Musil Date: Thu Aug 31 09:27:20 2023 +0200 ovs: Bump submodule to branch-3.2 Bump submodule to branch-3.2 mainly for: 759a29dc2d97 ("backtrace: Extend the backtrace functionality.") 1d78a3f3164a ("netdev-dpdk: Disable net/tap Tx L4 checksum offloads.") Unfortunately we cannot use the tag because we need the DPDK offload fix, which was merged later on. At the same time fix three issues caused by the bump. Remove our custom 'struct sctp_chunk_header' that was added to packets.h as part of: 501f665a5a4b ("conntrack: Extract l4 information for SCTP.") Adjust "daemonize_start" to accept two parameters and set the second to false, as we don't need access to DPDK devices directly at this moment. This was introduced by commit: 07cf5810de8d ("dpdk: Allow retaining CAP_SYS_RAWIO privileges.") Adjust the path for OvS python helpers, introduced by: bb0dd1135ba9 ("python: Rename build related code to ovs_build_helpers.") Reported-at: https://bugzilla.redhat.com/2164058 Signed-off-by: Ales Musil Acked-by: Mark Michelson Signed-off-by: Mark Michelson Signed-off-by: Dumitru Ceara Acked-by: Mark Michelson --- V2: - Fix commit reference in log. --- Makefile.am | 2 +- build-aux/sodepends.py | 2 +- build-aux/soexpand.py | 2 +- build-aux/xml2nroff | 14 +++++++------- ovs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index f7758d1145..e0b89db3de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -425,7 +425,7 @@ endif CLEANFILES += flake8-check include $(srcdir)/manpages.mk -$(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py $(OVS_SRCDIR)/python/build/soutil.py +$(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py $(OVS_SRCDIR)/python/ovs_build_helpers/soutil.py @PYTHONPATH=$(OVS_SRCDIR)/python$(psep)$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -Isrcdir,$(srcdir) -IOVS_MANDIR,$(OVS_MANDIR) $(MAN_ROOTS) >$(@F).tmp @if cmp -s $(@F).tmp $@; then \ touch $@; \ diff --git a/build-aux/sodepends.py b/build-aux/sodepends.py index 7b1f9c8403..c04a5c681b 100755 --- a/build-aux/sodepends.py +++ b/build-aux/sodepends.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from build import soutil +from ovs_build_helpers import soutil import sys import getopt import os diff --git a/build-aux/soexpand.py b/build-aux/soexpand.py index 00adcf47a3..f9ab809633 100755 --- a/build-aux/soexpand.py +++ b/build-aux/soexpand.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from build import soutil +from ovs_build_helpers import soutil import sys diff --git a/build-aux/xml2nroff b/build-aux/xml2nroff index 9e781a396d..dd9577204b 100755 --- a/build-aux/xml2nroff +++ b/build-aux/xml2nroff @@ -18,7 +18,7 @@ import getopt import sys import xml.dom.minidom -import build.nroff +from ovs_build_helpers import nroff argv0 = sys.argv[0] @@ -94,12 +94,12 @@ def manpage_to_nroff(xml_file, subst, include_path, version=None): . PP . I "\\$1" .. -''' % (build.nroff.text_to_nroff(program), - build.nroff.text_to_nroff(section), - build.nroff.text_to_nroff(title), - build.nroff.text_to_nroff(version)) +''' % (nroff.text_to_nroff(program), + nroff.text_to_nroff(section), + nroff.text_to_nroff(title), + nroff.text_to_nroff(version)) - s += build.nroff.block_xml_to_nroff(doc.childNodes) + "\n" + s += nroff.block_xml_to_nroff(doc.childNodes) + "\n" return s @@ -145,7 +145,7 @@ if __name__ == "__main__": try: s = manpage_to_nroff(args[0], subst, include_path, version) - except build.nroff.error.Error as e: + except nroff.error.Error as e: sys.stderr.write("%s: %s\n" % (argv0, e.msg)) sys.exit(1) for line in s.splitlines(): diff --git a/ovs b/ovs index 2410b95597..f818c2b4ae 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit 2410b95597fcec5f733caf77febdb46f4ffacd27 +Subproject commit f818c2b4aeeb6eade7cec2f9a2e5b7d25e15f19a