| Message ID | 20231113163431.806383-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,branch-22.06,v2] ovs: Bump submodule to use v3.0.5. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
Thanks Dumitru, Acked-by: Mark Michelson <mmichels@redhat.com> On 11/13/23 11:34, Dumitru Ceara wrote: > 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 <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> > --- > 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
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
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 <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> --- 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(-)