diff --git a/Makefile.am b/Makefile.am index e5a313b3cf..327df8dc6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 $@; \ 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