Skip to content

Commit

Permalink
ovs: Bump submodule to use v3.0.5.
Browse files Browse the repository at this point in the history
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 558da0c
    Author: Ales Musil <amusil@redhat.com>
    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 <amusil@redhat.com>
    Acked-by: Mark Michelson <mmichels@redhat.com>
    Signed-off-by: Mark Michelson <mmichels@redhat.com>

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
Acked-by: Mark Michelson <mmichels@redhat.com>
  • Loading branch information
dceara committed Nov 15, 2023
1 parent 62cfae9 commit 827ff00
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -419,7 +419,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 $@; \
Expand Down
2 changes: 1 addition & 1 deletion build-aux/sodepends.py
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-aux/soexpand.py
Expand Up @@ -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


Expand Down
14 changes: 7 additions & 7 deletions build-aux/xml2nroff
Expand Up @@ -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]

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion ovs
Submodule ovs updated 130 files

0 comments on commit 827ff00

Please sign in to comment.