diff mbox series

[ovs-dev] Remove manpages.mk from git

Message ID 5682b0883b7388338e31e3ad594b7914b0d70593.1596627527.git.tredaelli@redhat.com
State Changes Requested
Headers show
Series [ovs-dev] Remove manpages.mk from git | expand

Commit Message

Timothy Redaelli Aug. 5, 2020, 11:38 a.m. UTC
manpages.mk is generated at build-time using sodepends.py and so there is no
need to keep it in git.

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
---
 .gitignore  |   1 +
 Makefile.am |   2 +-
 manpages.mk | 266 ----------------------------------------------------
 3 files changed, 2 insertions(+), 267 deletions(-)
 delete mode 100644 manpages.mk

Comments

Gregory Rose Aug. 5, 2020, 4:37 p.m. UTC | #1
On 8/5/2020 4:38 AM, Timothy Redaelli wrote:
> manpages.mk is generated at build-time using sodepends.py and so there is no
> need to keep it in git.
> 
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>

Seems like a good idea to me.  Applies cleanly and test build succeeded
with no issues.

Tested-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: Greg Rose <gvrose8192@gmail.com>

> ---
>   .gitignore  |   1 +
>   Makefile.am |   2 +-
>   manpages.mk | 266 ----------------------------------------------------
>   3 files changed, 2 insertions(+), 267 deletions(-)
>   delete mode 100644 manpages.mk
> 
> diff --git a/.gitignore b/.gitignore
> index 2ac9cdac7..f1cdcf124 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -55,6 +55,7 @@
>   /docs-check
>   /install-sh
>   /libtool
> +/manpages.mk
>   /manpage-check
>   /missing
>   /missing-distfiles
> diff --git a/Makefile.am b/Makefile.am
> index 27ef9e4b4..8ead17029 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -412,7 +412,7 @@ flake8-check: $(FLAKE8_PYFILES)
>   endif
>   CLEANFILES += flake8-check
>   
> -include $(srcdir)/manpages.mk
> +-include $(srcdir)/manpages.mk
>   $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/build/soutil.py
>   	@PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
>   	@if cmp -s $(@F).tmp $@; then \
> diff --git a/manpages.mk b/manpages.mk
> deleted file mode 100644
> index dc201484c..000000000
> --- a/manpages.mk
> +++ /dev/null
> @@ -1,266 +0,0 @@
> -# Generated automatically -- do not modify!    -*- buffer-read-only: t -*-
> -
> -ovsdb/ovsdb-client.1: \
> -	ovsdb/ovsdb-client.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/daemon-syn.man \
> -	lib/daemon.man \
> -	lib/ovs.tmac \
> -	lib/ssl-bootstrap-syn.man \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-connect-syn.man \
> -	lib/ssl-connect.man \
> -	lib/ssl-syn.man \
> -	lib/ssl.man \
> -	lib/table.man \
> -	lib/vlog-syn.man \
> -	lib/vlog.man \
> -	ovsdb/ovsdb-schemas.man
> -ovsdb/ovsdb-client.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/daemon-syn.man:
> -lib/daemon.man:
> -lib/ovs.tmac:
> -lib/ssl-bootstrap-syn.man:
> -lib/ssl-bootstrap.man:
> -lib/ssl-connect-syn.man:
> -lib/ssl-connect.man:
> -lib/ssl-syn.man:
> -lib/ssl.man:
> -lib/table.man:
> -lib/vlog-syn.man:
> -lib/vlog.man:
> -ovsdb/ovsdb-schemas.man:
> -
> -ovsdb/ovsdb-server.1: \
> -	ovsdb/ovsdb-server.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/coverage-unixctl.man \
> -	lib/daemon-syn.man \
> -	lib/daemon.man \
> -	lib/memory-unixctl.man \
> -	lib/ovs.tmac \
> -	lib/service-syn.man \
> -	lib/service.man \
> -	lib/ssl-bootstrap-syn.man \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-connect-syn.man \
> -	lib/ssl-connect.man \
> -	lib/ssl-peer-ca-cert-syn.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl-syn.man \
> -	lib/ssl.man \
> -	lib/unixctl-syn.man \
> -	lib/unixctl.man \
> -	lib/vlog-syn.man \
> -	lib/vlog-unixctl.man \
> -	lib/vlog.man
> -ovsdb/ovsdb-server.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/coverage-unixctl.man:
> -lib/daemon-syn.man:
> -lib/daemon.man:
> -lib/memory-unixctl.man:
> -lib/ovs.tmac:
> -lib/service-syn.man:
> -lib/service.man:
> -lib/ssl-bootstrap-syn.man:
> -lib/ssl-bootstrap.man:
> -lib/ssl-connect-syn.man:
> -lib/ssl-connect.man:
> -lib/ssl-peer-ca-cert-syn.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl-syn.man:
> -lib/ssl.man:
> -lib/unixctl-syn.man:
> -lib/unixctl.man:
> -lib/vlog-syn.man:
> -lib/vlog-unixctl.man:
> -lib/vlog.man:
> -
> -ovsdb/ovsdb-tool.1: \
> -	ovsdb/ovsdb-tool.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/ovs.tmac \
> -	lib/vlog-syn.man \
> -	lib/vlog.man \
> -	ovsdb/ovsdb-schemas.man
> -ovsdb/ovsdb-tool.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/ovs.tmac:
> -lib/vlog-syn.man:
> -lib/vlog.man:
> -ovsdb/ovsdb-schemas.man:
> -
> -utilities/bugtool/ovs-bugtool.8: \
> -	utilities/bugtool/ovs-bugtool.8.in \
> -	lib/ovs.tmac
> -utilities/bugtool/ovs-bugtool.8.in:
> -lib/ovs.tmac:
> -
> -
> -utilities/ovs-dpctl-top.8: \
> -	utilities/ovs-dpctl-top.8.in \
> -	lib/ovs.tmac
> -utilities/ovs-dpctl-top.8.in:
> -lib/ovs.tmac:
> -
> -utilities/ovs-dpctl.8: \
> -	utilities/ovs-dpctl.8.in \
> -	lib/common.man \
> -	lib/dpctl.man \
> -	lib/ovs.tmac \
> -	lib/vlog.man
> -utilities/ovs-dpctl.8.in:
> -lib/common.man:
> -lib/dpctl.man:
> -lib/ovs.tmac:
> -lib/vlog.man:
> -
> -utilities/ovs-ofctl.8: \
> -	utilities/ovs-ofctl.8.in \
> -	lib/colors.man \
> -	lib/common.man \
> -	lib/daemon.man \
> -	lib/ofp-version.man \
> -	lib/ovs.tmac \
> -	lib/ssl.man \
> -	lib/unixctl.man \
> -	lib/vconn-active.man \
> -	lib/vlog.man
> -utilities/ovs-ofctl.8.in:
> -lib/colors.man:
> -lib/common.man:
> -lib/daemon.man:
> -lib/ofp-version.man:
> -lib/ovs.tmac:
> -lib/ssl.man:
> -lib/unixctl.man:
> -lib/vconn-active.man:
> -lib/vlog.man:
> -
> -utilities/ovs-pcap.1: \
> -	utilities/ovs-pcap.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/ovs.tmac
> -utilities/ovs-pcap.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/ovs.tmac:
> -
> -lib/ovs.tmac:
> -
> -utilities/ovs-testcontroller.8: \
> -	utilities/ovs-testcontroller.8.in \
> -	lib/common.man \
> -	lib/daemon.man \
> -	lib/ofp-version.man \
> -	lib/ovs.tmac \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/unixctl.man \
> -	lib/vconn-active.man \
> -	lib/vconn-passive.man \
> -	lib/vlog.man
> -utilities/ovs-testcontroller.8.in:
> -lib/common.man:
> -lib/daemon.man:
> -lib/ofp-version.man:
> -lib/ovs.tmac:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/unixctl.man:
> -lib/vconn-active.man:
> -lib/vconn-passive.man:
> -lib/vlog.man:
> -
> -utilities/ovs-vsctl.8: \
> -	utilities/ovs-vsctl.8.in \
> -	lib/common.man \
> -	lib/db-ctl-base.man \
> -	lib/ovs.tmac \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/table.man \
> -	lib/vconn-active.man \
> -	lib/vconn-passive.man \
> -	lib/vlog.man
> -utilities/ovs-vsctl.8.in:
> -lib/common.man:
> -lib/db-ctl-base.man:
> -lib/ovs.tmac:
> -lib/ssl-bootstrap.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/table.man:
> -lib/vconn-active.man:
> -lib/vconn-passive.man:
> -lib/vlog.man:
> -
> -vswitchd/ovs-vswitchd.8: \
> -	vswitchd/ovs-vswitchd.8.in \
> -	lib/common.man \
> -	lib/coverage-unixctl.man \
> -	lib/daemon.man \
> -	lib/dpctl.man \
> -	lib/dpif-netdev-unixctl.man \
> -	lib/memory-unixctl.man \
> -	lib/netdev-dpdk-unixctl.man \
> -	lib/ovs.tmac \
> -	lib/service.man \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/unixctl.man \
> -	lib/vlog-unixctl.man \
> -	lib/vlog.man \
> -	ofproto/ofproto-dpif-unixctl.man \
> -	ofproto/ofproto-tnl-unixctl.man \
> -	ofproto/ofproto-unixctl.man
> -vswitchd/ovs-vswitchd.8.in:
> -lib/common.man:
> -lib/coverage-unixctl.man:
> -lib/daemon.man:
> -lib/dpctl.man:
> -lib/dpif-netdev-unixctl.man:
> -lib/memory-unixctl.man:
> -lib/netdev-dpdk-unixctl.man:
> -lib/ovs.tmac:
> -lib/service.man:
> -lib/ssl-bootstrap.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/unixctl.man:
> -lib/vlog-unixctl.man:
> -lib/vlog.man:
> -ofproto/ofproto-dpif-unixctl.man:
> -ofproto/ofproto-tnl-unixctl.man:
> -ofproto/ofproto-unixctl.man:
> -
> -vtep/vtep-ctl.8: \
> -	vtep/vtep-ctl.8.in \
> -	lib/common.man \
> -	lib/db-ctl-base.man \
> -	lib/ovs.tmac \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/table.man \
> -	lib/vlog.man
> -vtep/vtep-ctl.8.in:
> -lib/common.man:
> -lib/db-ctl-base.man:
> -lib/ovs.tmac:
> -lib/ssl-bootstrap.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/table.man:
> -lib/vlog.man:
>
Flavio Leitner Aug. 12, 2020, 7:12 p.m. UTC | #2
On Wed, Aug 05, 2020 at 01:38:47PM +0200, Timothy Redaelli wrote:
> manpages.mk is generated at build-time using sodepends.py and so there is no
> need to keep it in git.
> 
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> ---
>  .gitignore  |   1 +
>  Makefile.am |   2 +-
>  manpages.mk | 266 ----------------------------------------------------
>  3 files changed, 2 insertions(+), 267 deletions(-)
>  delete mode 100644 manpages.mk
> 
> diff --git a/.gitignore b/.gitignore
> index 2ac9cdac7..f1cdcf124 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -55,6 +55,7 @@
>  /docs-check
>  /install-sh
>  /libtool
> +/manpages.mk
>  /manpage-check
>  /missing
>  /missing-distfiles
> diff --git a/Makefile.am b/Makefile.am
> index 27ef9e4b4..8ead17029 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -412,7 +412,7 @@ flake8-check: $(FLAKE8_PYFILES)
>  endif
>  CLEANFILES += flake8-check
>  
> -include $(srcdir)/manpages.mk
> +-include $(srcdir)/manpages.mk

Why is the error ignored? 

fbl


>  $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/build/soutil.py
>  	@PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
>  	@if cmp -s $(@F).tmp $@; then \
> diff --git a/manpages.mk b/manpages.mk
> deleted file mode 100644
> index dc201484c..000000000
> --- a/manpages.mk
> +++ /dev/null
> @@ -1,266 +0,0 @@
> -# Generated automatically -- do not modify!    -*- buffer-read-only: t -*-
> -
> -ovsdb/ovsdb-client.1: \
> -	ovsdb/ovsdb-client.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/daemon-syn.man \
> -	lib/daemon.man \
> -	lib/ovs.tmac \
> -	lib/ssl-bootstrap-syn.man \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-connect-syn.man \
> -	lib/ssl-connect.man \
> -	lib/ssl-syn.man \
> -	lib/ssl.man \
> -	lib/table.man \
> -	lib/vlog-syn.man \
> -	lib/vlog.man \
> -	ovsdb/ovsdb-schemas.man
> -ovsdb/ovsdb-client.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/daemon-syn.man:
> -lib/daemon.man:
> -lib/ovs.tmac:
> -lib/ssl-bootstrap-syn.man:
> -lib/ssl-bootstrap.man:
> -lib/ssl-connect-syn.man:
> -lib/ssl-connect.man:
> -lib/ssl-syn.man:
> -lib/ssl.man:
> -lib/table.man:
> -lib/vlog-syn.man:
> -lib/vlog.man:
> -ovsdb/ovsdb-schemas.man:
> -
> -ovsdb/ovsdb-server.1: \
> -	ovsdb/ovsdb-server.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/coverage-unixctl.man \
> -	lib/daemon-syn.man \
> -	lib/daemon.man \
> -	lib/memory-unixctl.man \
> -	lib/ovs.tmac \
> -	lib/service-syn.man \
> -	lib/service.man \
> -	lib/ssl-bootstrap-syn.man \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-connect-syn.man \
> -	lib/ssl-connect.man \
> -	lib/ssl-peer-ca-cert-syn.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl-syn.man \
> -	lib/ssl.man \
> -	lib/unixctl-syn.man \
> -	lib/unixctl.man \
> -	lib/vlog-syn.man \
> -	lib/vlog-unixctl.man \
> -	lib/vlog.man
> -ovsdb/ovsdb-server.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/coverage-unixctl.man:
> -lib/daemon-syn.man:
> -lib/daemon.man:
> -lib/memory-unixctl.man:
> -lib/ovs.tmac:
> -lib/service-syn.man:
> -lib/service.man:
> -lib/ssl-bootstrap-syn.man:
> -lib/ssl-bootstrap.man:
> -lib/ssl-connect-syn.man:
> -lib/ssl-connect.man:
> -lib/ssl-peer-ca-cert-syn.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl-syn.man:
> -lib/ssl.man:
> -lib/unixctl-syn.man:
> -lib/unixctl.man:
> -lib/vlog-syn.man:
> -lib/vlog-unixctl.man:
> -lib/vlog.man:
> -
> -ovsdb/ovsdb-tool.1: \
> -	ovsdb/ovsdb-tool.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/ovs.tmac \
> -	lib/vlog-syn.man \
> -	lib/vlog.man \
> -	ovsdb/ovsdb-schemas.man
> -ovsdb/ovsdb-tool.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/ovs.tmac:
> -lib/vlog-syn.man:
> -lib/vlog.man:
> -ovsdb/ovsdb-schemas.man:
> -
> -utilities/bugtool/ovs-bugtool.8: \
> -	utilities/bugtool/ovs-bugtool.8.in \
> -	lib/ovs.tmac
> -utilities/bugtool/ovs-bugtool.8.in:
> -lib/ovs.tmac:
> -
> -
> -utilities/ovs-dpctl-top.8: \
> -	utilities/ovs-dpctl-top.8.in \
> -	lib/ovs.tmac
> -utilities/ovs-dpctl-top.8.in:
> -lib/ovs.tmac:
> -
> -utilities/ovs-dpctl.8: \
> -	utilities/ovs-dpctl.8.in \
> -	lib/common.man \
> -	lib/dpctl.man \
> -	lib/ovs.tmac \
> -	lib/vlog.man
> -utilities/ovs-dpctl.8.in:
> -lib/common.man:
> -lib/dpctl.man:
> -lib/ovs.tmac:
> -lib/vlog.man:
> -
> -utilities/ovs-ofctl.8: \
> -	utilities/ovs-ofctl.8.in \
> -	lib/colors.man \
> -	lib/common.man \
> -	lib/daemon.man \
> -	lib/ofp-version.man \
> -	lib/ovs.tmac \
> -	lib/ssl.man \
> -	lib/unixctl.man \
> -	lib/vconn-active.man \
> -	lib/vlog.man
> -utilities/ovs-ofctl.8.in:
> -lib/colors.man:
> -lib/common.man:
> -lib/daemon.man:
> -lib/ofp-version.man:
> -lib/ovs.tmac:
> -lib/ssl.man:
> -lib/unixctl.man:
> -lib/vconn-active.man:
> -lib/vlog.man:
> -
> -utilities/ovs-pcap.1: \
> -	utilities/ovs-pcap.1.in \
> -	lib/common-syn.man \
> -	lib/common.man \
> -	lib/ovs.tmac
> -utilities/ovs-pcap.1.in:
> -lib/common-syn.man:
> -lib/common.man:
> -lib/ovs.tmac:
> -
> -lib/ovs.tmac:
> -
> -utilities/ovs-testcontroller.8: \
> -	utilities/ovs-testcontroller.8.in \
> -	lib/common.man \
> -	lib/daemon.man \
> -	lib/ofp-version.man \
> -	lib/ovs.tmac \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/unixctl.man \
> -	lib/vconn-active.man \
> -	lib/vconn-passive.man \
> -	lib/vlog.man
> -utilities/ovs-testcontroller.8.in:
> -lib/common.man:
> -lib/daemon.man:
> -lib/ofp-version.man:
> -lib/ovs.tmac:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/unixctl.man:
> -lib/vconn-active.man:
> -lib/vconn-passive.man:
> -lib/vlog.man:
> -
> -utilities/ovs-vsctl.8: \
> -	utilities/ovs-vsctl.8.in \
> -	lib/common.man \
> -	lib/db-ctl-base.man \
> -	lib/ovs.tmac \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/table.man \
> -	lib/vconn-active.man \
> -	lib/vconn-passive.man \
> -	lib/vlog.man
> -utilities/ovs-vsctl.8.in:
> -lib/common.man:
> -lib/db-ctl-base.man:
> -lib/ovs.tmac:
> -lib/ssl-bootstrap.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/table.man:
> -lib/vconn-active.man:
> -lib/vconn-passive.man:
> -lib/vlog.man:
> -
> -vswitchd/ovs-vswitchd.8: \
> -	vswitchd/ovs-vswitchd.8.in \
> -	lib/common.man \
> -	lib/coverage-unixctl.man \
> -	lib/daemon.man \
> -	lib/dpctl.man \
> -	lib/dpif-netdev-unixctl.man \
> -	lib/memory-unixctl.man \
> -	lib/netdev-dpdk-unixctl.man \
> -	lib/ovs.tmac \
> -	lib/service.man \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/unixctl.man \
> -	lib/vlog-unixctl.man \
> -	lib/vlog.man \
> -	ofproto/ofproto-dpif-unixctl.man \
> -	ofproto/ofproto-tnl-unixctl.man \
> -	ofproto/ofproto-unixctl.man
> -vswitchd/ovs-vswitchd.8.in:
> -lib/common.man:
> -lib/coverage-unixctl.man:
> -lib/daemon.man:
> -lib/dpctl.man:
> -lib/dpif-netdev-unixctl.man:
> -lib/memory-unixctl.man:
> -lib/netdev-dpdk-unixctl.man:
> -lib/ovs.tmac:
> -lib/service.man:
> -lib/ssl-bootstrap.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/unixctl.man:
> -lib/vlog-unixctl.man:
> -lib/vlog.man:
> -ofproto/ofproto-dpif-unixctl.man:
> -ofproto/ofproto-tnl-unixctl.man:
> -ofproto/ofproto-unixctl.man:
> -
> -vtep/vtep-ctl.8: \
> -	vtep/vtep-ctl.8.in \
> -	lib/common.man \
> -	lib/db-ctl-base.man \
> -	lib/ovs.tmac \
> -	lib/ssl-bootstrap.man \
> -	lib/ssl-peer-ca-cert.man \
> -	lib/ssl.man \
> -	lib/table.man \
> -	lib/vlog.man
> -vtep/vtep-ctl.8.in:
> -lib/common.man:
> -lib/db-ctl-base.man:
> -lib/ovs.tmac:
> -lib/ssl-bootstrap.man:
> -lib/ssl-peer-ca-cert.man:
> -lib/ssl.man:
> -lib/table.man:
> -lib/vlog.man:
> -- 
> 2.26.2
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Timothy Redaelli Sept. 1, 2020, 6 p.m. UTC | #3
On Wed, 12 Aug 2020 16:12:03 -0300
Flavio Leitner <fbl@sysclose.org> wrote:

> On Wed, Aug 05, 2020 at 01:38:47PM +0200, Timothy Redaelli wrote:
> > manpages.mk is generated at build-time using sodepends.py and so there is no
> > need to keep it in git.
> > 
> > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> > ---
> >  .gitignore  |   1 +
> >  Makefile.am |   2 +-
> >  manpages.mk | 266 ----------------------------------------------------
> >  3 files changed, 2 insertions(+), 267 deletions(-)
> >  delete mode 100644 manpages.mk
> > 
> > diff --git a/.gitignore b/.gitignore
> > index 2ac9cdac7..f1cdcf124 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -55,6 +55,7 @@
> >  /docs-check
> >  /install-sh
> >  /libtool
> > +/manpages.mk
> >  /manpage-check
> >  /missing
> >  /missing-distfiles
> > diff --git a/Makefile.am b/Makefile.am
> > index 27ef9e4b4..8ead17029 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -412,7 +412,7 @@ flake8-check: $(FLAKE8_PYFILES)
> >  endif
> >  CLEANFILES += flake8-check
> >  
> > -include $(srcdir)/manpages.mk
> > +-include $(srcdir)/manpages.mk
> 
> Why is the error ignored? 

Because automake tries to include manpages.mk during boot.sh phase and
if it not exists it fails:

automake: error: cannot open < manpages.mk: No such file or directory


> fbl
> 
> 
> >  $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/build/soutil.py
> >  	@PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
> >  	@if cmp -s $(@F).tmp $@; then \
> > diff --git a/manpages.mk b/manpages.mk
> > deleted file mode 100644
> > index dc201484c..000000000
> > --- a/manpages.mk
> > +++ /dev/null
> > @@ -1,266 +0,0 @@
> > -# Generated automatically -- do not modify!    -*- buffer-read-only: t -*-
> > -
> > -ovsdb/ovsdb-client.1: \
> > -	ovsdb/ovsdb-client.1.in \
> > -	lib/common-syn.man \
> > -	lib/common.man \
> > -	lib/daemon-syn.man \
> > -	lib/daemon.man \
> > -	lib/ovs.tmac \
> > -	lib/ssl-bootstrap-syn.man \
> > -	lib/ssl-bootstrap.man \
> > -	lib/ssl-connect-syn.man \
> > -	lib/ssl-connect.man \
> > -	lib/ssl-syn.man \
> > -	lib/ssl.man \
> > -	lib/table.man \
> > -	lib/vlog-syn.man \
> > -	lib/vlog.man \
> > -	ovsdb/ovsdb-schemas.man
> > -ovsdb/ovsdb-client.1.in:
> > -lib/common-syn.man:
> > -lib/common.man:
> > -lib/daemon-syn.man:
> > -lib/daemon.man:
> > -lib/ovs.tmac:
> > -lib/ssl-bootstrap-syn.man:
> > -lib/ssl-bootstrap.man:
> > -lib/ssl-connect-syn.man:
> > -lib/ssl-connect.man:
> > -lib/ssl-syn.man:
> > -lib/ssl.man:
> > -lib/table.man:
> > -lib/vlog-syn.man:
> > -lib/vlog.man:
> > -ovsdb/ovsdb-schemas.man:
> > -
> > -ovsdb/ovsdb-server.1: \
> > -	ovsdb/ovsdb-server.1.in \
> > -	lib/common-syn.man \
> > -	lib/common.man \
> > -	lib/coverage-unixctl.man \
> > -	lib/daemon-syn.man \
> > -	lib/daemon.man \
> > -	lib/memory-unixctl.man \
> > -	lib/ovs.tmac \
> > -	lib/service-syn.man \
> > -	lib/service.man \
> > -	lib/ssl-bootstrap-syn.man \
> > -	lib/ssl-bootstrap.man \
> > -	lib/ssl-connect-syn.man \
> > -	lib/ssl-connect.man \
> > -	lib/ssl-peer-ca-cert-syn.man \
> > -	lib/ssl-peer-ca-cert.man \
> > -	lib/ssl-syn.man \
> > -	lib/ssl.man \
> > -	lib/unixctl-syn.man \
> > -	lib/unixctl.man \
> > -	lib/vlog-syn.man \
> > -	lib/vlog-unixctl.man \
> > -	lib/vlog.man
> > -ovsdb/ovsdb-server.1.in:
> > -lib/common-syn.man:
> > -lib/common.man:
> > -lib/coverage-unixctl.man:
> > -lib/daemon-syn.man:
> > -lib/daemon.man:
> > -lib/memory-unixctl.man:
> > -lib/ovs.tmac:
> > -lib/service-syn.man:
> > -lib/service.man:
> > -lib/ssl-bootstrap-syn.man:
> > -lib/ssl-bootstrap.man:
> > -lib/ssl-connect-syn.man:
> > -lib/ssl-connect.man:
> > -lib/ssl-peer-ca-cert-syn.man:
> > -lib/ssl-peer-ca-cert.man:
> > -lib/ssl-syn.man:
> > -lib/ssl.man:
> > -lib/unixctl-syn.man:
> > -lib/unixctl.man:
> > -lib/vlog-syn.man:
> > -lib/vlog-unixctl.man:
> > -lib/vlog.man:
> > -
> > -ovsdb/ovsdb-tool.1: \
> > -	ovsdb/ovsdb-tool.1.in \
> > -	lib/common-syn.man \
> > -	lib/common.man \
> > -	lib/ovs.tmac \
> > -	lib/vlog-syn.man \
> > -	lib/vlog.man \
> > -	ovsdb/ovsdb-schemas.man
> > -ovsdb/ovsdb-tool.1.in:
> > -lib/common-syn.man:
> > -lib/common.man:
> > -lib/ovs.tmac:
> > -lib/vlog-syn.man:
> > -lib/vlog.man:
> > -ovsdb/ovsdb-schemas.man:
> > -
> > -utilities/bugtool/ovs-bugtool.8: \
> > -	utilities/bugtool/ovs-bugtool.8.in \
> > -	lib/ovs.tmac
> > -utilities/bugtool/ovs-bugtool.8.in:
> > -lib/ovs.tmac:
> > -
> > -
> > -utilities/ovs-dpctl-top.8: \
> > -	utilities/ovs-dpctl-top.8.in \
> > -	lib/ovs.tmac
> > -utilities/ovs-dpctl-top.8.in:
> > -lib/ovs.tmac:
> > -
> > -utilities/ovs-dpctl.8: \
> > -	utilities/ovs-dpctl.8.in \
> > -	lib/common.man \
> > -	lib/dpctl.man \
> > -	lib/ovs.tmac \
> > -	lib/vlog.man
> > -utilities/ovs-dpctl.8.in:
> > -lib/common.man:
> > -lib/dpctl.man:
> > -lib/ovs.tmac:
> > -lib/vlog.man:
> > -
> > -utilities/ovs-ofctl.8: \
> > -	utilities/ovs-ofctl.8.in \
> > -	lib/colors.man \
> > -	lib/common.man \
> > -	lib/daemon.man \
> > -	lib/ofp-version.man \
> > -	lib/ovs.tmac \
> > -	lib/ssl.man \
> > -	lib/unixctl.man \
> > -	lib/vconn-active.man \
> > -	lib/vlog.man
> > -utilities/ovs-ofctl.8.in:
> > -lib/colors.man:
> > -lib/common.man:
> > -lib/daemon.man:
> > -lib/ofp-version.man:
> > -lib/ovs.tmac:
> > -lib/ssl.man:
> > -lib/unixctl.man:
> > -lib/vconn-active.man:
> > -lib/vlog.man:
> > -
> > -utilities/ovs-pcap.1: \
> > -	utilities/ovs-pcap.1.in \
> > -	lib/common-syn.man \
> > -	lib/common.man \
> > -	lib/ovs.tmac
> > -utilities/ovs-pcap.1.in:
> > -lib/common-syn.man:
> > -lib/common.man:
> > -lib/ovs.tmac:
> > -
> > -lib/ovs.tmac:
> > -
> > -utilities/ovs-testcontroller.8: \
> > -	utilities/ovs-testcontroller.8.in \
> > -	lib/common.man \
> > -	lib/daemon.man \
> > -	lib/ofp-version.man \
> > -	lib/ovs.tmac \
> > -	lib/ssl-peer-ca-cert.man \
> > -	lib/ssl.man \
> > -	lib/unixctl.man \
> > -	lib/vconn-active.man \
> > -	lib/vconn-passive.man \
> > -	lib/vlog.man
> > -utilities/ovs-testcontroller.8.in:
> > -lib/common.man:
> > -lib/daemon.man:
> > -lib/ofp-version.man:
> > -lib/ovs.tmac:
> > -lib/ssl-peer-ca-cert.man:
> > -lib/ssl.man:
> > -lib/unixctl.man:
> > -lib/vconn-active.man:
> > -lib/vconn-passive.man:
> > -lib/vlog.man:
> > -
> > -utilities/ovs-vsctl.8: \
> > -	utilities/ovs-vsctl.8.in \
> > -	lib/common.man \
> > -	lib/db-ctl-base.man \
> > -	lib/ovs.tmac \
> > -	lib/ssl-bootstrap.man \
> > -	lib/ssl-peer-ca-cert.man \
> > -	lib/ssl.man \
> > -	lib/table.man \
> > -	lib/vconn-active.man \
> > -	lib/vconn-passive.man \
> > -	lib/vlog.man
> > -utilities/ovs-vsctl.8.in:
> > -lib/common.man:
> > -lib/db-ctl-base.man:
> > -lib/ovs.tmac:
> > -lib/ssl-bootstrap.man:
> > -lib/ssl-peer-ca-cert.man:
> > -lib/ssl.man:
> > -lib/table.man:
> > -lib/vconn-active.man:
> > -lib/vconn-passive.man:
> > -lib/vlog.man:
> > -
> > -vswitchd/ovs-vswitchd.8: \
> > -	vswitchd/ovs-vswitchd.8.in \
> > -	lib/common.man \
> > -	lib/coverage-unixctl.man \
> > -	lib/daemon.man \
> > -	lib/dpctl.man \
> > -	lib/dpif-netdev-unixctl.man \
> > -	lib/memory-unixctl.man \
> > -	lib/netdev-dpdk-unixctl.man \
> > -	lib/ovs.tmac \
> > -	lib/service.man \
> > -	lib/ssl-bootstrap.man \
> > -	lib/ssl-peer-ca-cert.man \
> > -	lib/ssl.man \
> > -	lib/unixctl.man \
> > -	lib/vlog-unixctl.man \
> > -	lib/vlog.man \
> > -	ofproto/ofproto-dpif-unixctl.man \
> > -	ofproto/ofproto-tnl-unixctl.man \
> > -	ofproto/ofproto-unixctl.man
> > -vswitchd/ovs-vswitchd.8.in:
> > -lib/common.man:
> > -lib/coverage-unixctl.man:
> > -lib/daemon.man:
> > -lib/dpctl.man:
> > -lib/dpif-netdev-unixctl.man:
> > -lib/memory-unixctl.man:
> > -lib/netdev-dpdk-unixctl.man:
> > -lib/ovs.tmac:
> > -lib/service.man:
> > -lib/ssl-bootstrap.man:
> > -lib/ssl-peer-ca-cert.man:
> > -lib/ssl.man:
> > -lib/unixctl.man:
> > -lib/vlog-unixctl.man:
> > -lib/vlog.man:
> > -ofproto/ofproto-dpif-unixctl.man:
> > -ofproto/ofproto-tnl-unixctl.man:
> > -ofproto/ofproto-unixctl.man:
> > -
> > -vtep/vtep-ctl.8: \
> > -	vtep/vtep-ctl.8.in \
> > -	lib/common.man \
> > -	lib/db-ctl-base.man \
> > -	lib/ovs.tmac \
> > -	lib/ssl-bootstrap.man \
> > -	lib/ssl-peer-ca-cert.man \
> > -	lib/ssl.man \
> > -	lib/table.man \
> > -	lib/vlog.man
> > -vtep/vtep-ctl.8.in:
> > -lib/common.man:
> > -lib/db-ctl-base.man:
> > -lib/ovs.tmac:
> > -lib/ssl-bootstrap.man:
> > -lib/ssl-peer-ca-cert.man:
> > -lib/ssl.man:
> > -lib/table.man:
> > -lib/vlog.man:
> > -- 
> > 2.26.2
> > 
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Flavio Leitner Sept. 2, 2020, 1:33 p.m. UTC | #4
On Tue, Sep 01, 2020 at 08:00:09PM +0200, Timothy Redaelli wrote:
> On Wed, 12 Aug 2020 16:12:03 -0300
> Flavio Leitner <fbl@sysclose.org> wrote:
> 
> > On Wed, Aug 05, 2020 at 01:38:47PM +0200, Timothy Redaelli wrote:
> > > manpages.mk is generated at build-time using sodepends.py and so there is no
> > > need to keep it in git.
> > > 
> > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> > > ---
> > >  .gitignore  |   1 +
> > >  Makefile.am |   2 +-
> > >  manpages.mk | 266 ----------------------------------------------------
> > >  3 files changed, 2 insertions(+), 267 deletions(-)
> > >  delete mode 100644 manpages.mk
> > > 
> > > diff --git a/.gitignore b/.gitignore
> > > index 2ac9cdac7..f1cdcf124 100644
> > > --- a/.gitignore
> > > +++ b/.gitignore
> > > @@ -55,6 +55,7 @@
> > >  /docs-check
> > >  /install-sh
> > >  /libtool
> > > +/manpages.mk
> > >  /manpage-check
> > >  /missing
> > >  /missing-distfiles
> > > diff --git a/Makefile.am b/Makefile.am
> > > index 27ef9e4b4..8ead17029 100644
> > > --- a/Makefile.am
> > > +++ b/Makefile.am
> > > @@ -412,7 +412,7 @@ flake8-check: $(FLAKE8_PYFILES)
> > >  endif
> > >  CLEANFILES += flake8-check
> > >  
> > > -include $(srcdir)/manpages.mk
> > > +-include $(srcdir)/manpages.mk
> > 
> > Why is the error ignored? 
> 
> Because automake tries to include manpages.mk during boot.sh phase and
> if it not exists it fails:
> 
> automake: error: cannot open < manpages.mk: No such file or directory

Makes sense. My concern is if the sodepends.py generates an empty
manpages.mk, because we won't see any error reported. If sodepends.py
generates a bad file though, then 'make' will shout, so not an issue.

Anyways, I don't know a better way to fix this.

Acked-by: Flavio Leitner <fbl@sysclose.org>

Thanks!
fbl

> > >  $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/build/soutil.py
> > >  	@PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
> > >  	@if cmp -s $(@F).tmp $@; then \
> > > diff --git a/manpages.mk b/manpages.mk
> > > deleted file mode 100644
> > > index dc201484c..000000000
> > > --- a/manpages.mk
> > > +++ /dev/null
> > > @@ -1,266 +0,0 @@
> > > -# Generated automatically -- do not modify!    -*- buffer-read-only: t -*-
> > > -
> > > -ovsdb/ovsdb-client.1: \
> > > -	ovsdb/ovsdb-client.1.in \
> > > -	lib/common-syn.man \
> > > -	lib/common.man \
> > > -	lib/daemon-syn.man \
> > > -	lib/daemon.man \
> > > -	lib/ovs.tmac \
> > > -	lib/ssl-bootstrap-syn.man \
> > > -	lib/ssl-bootstrap.man \
> > > -	lib/ssl-connect-syn.man \
> > > -	lib/ssl-connect.man \
> > > -	lib/ssl-syn.man \
> > > -	lib/ssl.man \
> > > -	lib/table.man \
> > > -	lib/vlog-syn.man \
> > > -	lib/vlog.man \
> > > -	ovsdb/ovsdb-schemas.man
> > > -ovsdb/ovsdb-client.1.in:
> > > -lib/common-syn.man:
> > > -lib/common.man:
> > > -lib/daemon-syn.man:
> > > -lib/daemon.man:
> > > -lib/ovs.tmac:
> > > -lib/ssl-bootstrap-syn.man:
> > > -lib/ssl-bootstrap.man:
> > > -lib/ssl-connect-syn.man:
> > > -lib/ssl-connect.man:
> > > -lib/ssl-syn.man:
> > > -lib/ssl.man:
> > > -lib/table.man:
> > > -lib/vlog-syn.man:
> > > -lib/vlog.man:
> > > -ovsdb/ovsdb-schemas.man:
> > > -
> > > -ovsdb/ovsdb-server.1: \
> > > -	ovsdb/ovsdb-server.1.in \
> > > -	lib/common-syn.man \
> > > -	lib/common.man \
> > > -	lib/coverage-unixctl.man \
> > > -	lib/daemon-syn.man \
> > > -	lib/daemon.man \
> > > -	lib/memory-unixctl.man \
> > > -	lib/ovs.tmac \
> > > -	lib/service-syn.man \
> > > -	lib/service.man \
> > > -	lib/ssl-bootstrap-syn.man \
> > > -	lib/ssl-bootstrap.man \
> > > -	lib/ssl-connect-syn.man \
> > > -	lib/ssl-connect.man \
> > > -	lib/ssl-peer-ca-cert-syn.man \
> > > -	lib/ssl-peer-ca-cert.man \
> > > -	lib/ssl-syn.man \
> > > -	lib/ssl.man \
> > > -	lib/unixctl-syn.man \
> > > -	lib/unixctl.man \
> > > -	lib/vlog-syn.man \
> > > -	lib/vlog-unixctl.man \
> > > -	lib/vlog.man
> > > -ovsdb/ovsdb-server.1.in:
> > > -lib/common-syn.man:
> > > -lib/common.man:
> > > -lib/coverage-unixctl.man:
> > > -lib/daemon-syn.man:
> > > -lib/daemon.man:
> > > -lib/memory-unixctl.man:
> > > -lib/ovs.tmac:
> > > -lib/service-syn.man:
> > > -lib/service.man:
> > > -lib/ssl-bootstrap-syn.man:
> > > -lib/ssl-bootstrap.man:
> > > -lib/ssl-connect-syn.man:
> > > -lib/ssl-connect.man:
> > > -lib/ssl-peer-ca-cert-syn.man:
> > > -lib/ssl-peer-ca-cert.man:
> > > -lib/ssl-syn.man:
> > > -lib/ssl.man:
> > > -lib/unixctl-syn.man:
> > > -lib/unixctl.man:
> > > -lib/vlog-syn.man:
> > > -lib/vlog-unixctl.man:
> > > -lib/vlog.man:
> > > -
> > > -ovsdb/ovsdb-tool.1: \
> > > -	ovsdb/ovsdb-tool.1.in \
> > > -	lib/common-syn.man \
> > > -	lib/common.man \
> > > -	lib/ovs.tmac \
> > > -	lib/vlog-syn.man \
> > > -	lib/vlog.man \
> > > -	ovsdb/ovsdb-schemas.man
> > > -ovsdb/ovsdb-tool.1.in:
> > > -lib/common-syn.man:
> > > -lib/common.man:
> > > -lib/ovs.tmac:
> > > -lib/vlog-syn.man:
> > > -lib/vlog.man:
> > > -ovsdb/ovsdb-schemas.man:
> > > -
> > > -utilities/bugtool/ovs-bugtool.8: \
> > > -	utilities/bugtool/ovs-bugtool.8.in \
> > > -	lib/ovs.tmac
> > > -utilities/bugtool/ovs-bugtool.8.in:
> > > -lib/ovs.tmac:
> > > -
> > > -
> > > -utilities/ovs-dpctl-top.8: \
> > > -	utilities/ovs-dpctl-top.8.in \
> > > -	lib/ovs.tmac
> > > -utilities/ovs-dpctl-top.8.in:
> > > -lib/ovs.tmac:
> > > -
> > > -utilities/ovs-dpctl.8: \
> > > -	utilities/ovs-dpctl.8.in \
> > > -	lib/common.man \
> > > -	lib/dpctl.man \
> > > -	lib/ovs.tmac \
> > > -	lib/vlog.man
> > > -utilities/ovs-dpctl.8.in:
> > > -lib/common.man:
> > > -lib/dpctl.man:
> > > -lib/ovs.tmac:
> > > -lib/vlog.man:
> > > -
> > > -utilities/ovs-ofctl.8: \
> > > -	utilities/ovs-ofctl.8.in \
> > > -	lib/colors.man \
> > > -	lib/common.man \
> > > -	lib/daemon.man \
> > > -	lib/ofp-version.man \
> > > -	lib/ovs.tmac \
> > > -	lib/ssl.man \
> > > -	lib/unixctl.man \
> > > -	lib/vconn-active.man \
> > > -	lib/vlog.man
> > > -utilities/ovs-ofctl.8.in:
> > > -lib/colors.man:
> > > -lib/common.man:
> > > -lib/daemon.man:
> > > -lib/ofp-version.man:
> > > -lib/ovs.tmac:
> > > -lib/ssl.man:
> > > -lib/unixctl.man:
> > > -lib/vconn-active.man:
> > > -lib/vlog.man:
> > > -
> > > -utilities/ovs-pcap.1: \
> > > -	utilities/ovs-pcap.1.in \
> > > -	lib/common-syn.man \
> > > -	lib/common.man \
> > > -	lib/ovs.tmac
> > > -utilities/ovs-pcap.1.in:
> > > -lib/common-syn.man:
> > > -lib/common.man:
> > > -lib/ovs.tmac:
> > > -
> > > -lib/ovs.tmac:
> > > -
> > > -utilities/ovs-testcontroller.8: \
> > > -	utilities/ovs-testcontroller.8.in \
> > > -	lib/common.man \
> > > -	lib/daemon.man \
> > > -	lib/ofp-version.man \
> > > -	lib/ovs.tmac \
> > > -	lib/ssl-peer-ca-cert.man \
> > > -	lib/ssl.man \
> > > -	lib/unixctl.man \
> > > -	lib/vconn-active.man \
> > > -	lib/vconn-passive.man \
> > > -	lib/vlog.man
> > > -utilities/ovs-testcontroller.8.in:
> > > -lib/common.man:
> > > -lib/daemon.man:
> > > -lib/ofp-version.man:
> > > -lib/ovs.tmac:
> > > -lib/ssl-peer-ca-cert.man:
> > > -lib/ssl.man:
> > > -lib/unixctl.man:
> > > -lib/vconn-active.man:
> > > -lib/vconn-passive.man:
> > > -lib/vlog.man:
> > > -
> > > -utilities/ovs-vsctl.8: \
> > > -	utilities/ovs-vsctl.8.in \
> > > -	lib/common.man \
> > > -	lib/db-ctl-base.man \
> > > -	lib/ovs.tmac \
> > > -	lib/ssl-bootstrap.man \
> > > -	lib/ssl-peer-ca-cert.man \
> > > -	lib/ssl.man \
> > > -	lib/table.man \
> > > -	lib/vconn-active.man \
> > > -	lib/vconn-passive.man \
> > > -	lib/vlog.man
> > > -utilities/ovs-vsctl.8.in:
> > > -lib/common.man:
> > > -lib/db-ctl-base.man:
> > > -lib/ovs.tmac:
> > > -lib/ssl-bootstrap.man:
> > > -lib/ssl-peer-ca-cert.man:
> > > -lib/ssl.man:
> > > -lib/table.man:
> > > -lib/vconn-active.man:
> > > -lib/vconn-passive.man:
> > > -lib/vlog.man:
> > > -
> > > -vswitchd/ovs-vswitchd.8: \
> > > -	vswitchd/ovs-vswitchd.8.in \
> > > -	lib/common.man \
> > > -	lib/coverage-unixctl.man \
> > > -	lib/daemon.man \
> > > -	lib/dpctl.man \
> > > -	lib/dpif-netdev-unixctl.man \
> > > -	lib/memory-unixctl.man \
> > > -	lib/netdev-dpdk-unixctl.man \
> > > -	lib/ovs.tmac \
> > > -	lib/service.man \
> > > -	lib/ssl-bootstrap.man \
> > > -	lib/ssl-peer-ca-cert.man \
> > > -	lib/ssl.man \
> > > -	lib/unixctl.man \
> > > -	lib/vlog-unixctl.man \
> > > -	lib/vlog.man \
> > > -	ofproto/ofproto-dpif-unixctl.man \
> > > -	ofproto/ofproto-tnl-unixctl.man \
> > > -	ofproto/ofproto-unixctl.man
> > > -vswitchd/ovs-vswitchd.8.in:
> > > -lib/common.man:
> > > -lib/coverage-unixctl.man:
> > > -lib/daemon.man:
> > > -lib/dpctl.man:
> > > -lib/dpif-netdev-unixctl.man:
> > > -lib/memory-unixctl.man:
> > > -lib/netdev-dpdk-unixctl.man:
> > > -lib/ovs.tmac:
> > > -lib/service.man:
> > > -lib/ssl-bootstrap.man:
> > > -lib/ssl-peer-ca-cert.man:
> > > -lib/ssl.man:
> > > -lib/unixctl.man:
> > > -lib/vlog-unixctl.man:
> > > -lib/vlog.man:
> > > -ofproto/ofproto-dpif-unixctl.man:
> > > -ofproto/ofproto-tnl-unixctl.man:
> > > -ofproto/ofproto-unixctl.man:
> > > -
> > > -vtep/vtep-ctl.8: \
> > > -	vtep/vtep-ctl.8.in \
> > > -	lib/common.man \
> > > -	lib/db-ctl-base.man \
> > > -	lib/ovs.tmac \
> > > -	lib/ssl-bootstrap.man \
> > > -	lib/ssl-peer-ca-cert.man \
> > > -	lib/ssl.man \
> > > -	lib/table.man \
> > > -	lib/vlog.man
> > > -vtep/vtep-ctl.8.in:
> > > -lib/common.man:
> > > -lib/db-ctl-base.man:
> > > -lib/ovs.tmac:
> > > -lib/ssl-bootstrap.man:
> > > -lib/ssl-peer-ca-cert.man:
> > > -lib/ssl.man:
> > > -lib/table.man:
> > > -lib/vlog.man:
> > > -- 
> > > 2.26.2
> > > 
> > > _______________________________________________
> > > dev mailing list
> > > dev@openvswitch.org
> > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> > 
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Ilya Maximets Sept. 2, 2020, 1:57 p.m. UTC | #5
On 8/5/20 1:38 PM, Timothy Redaelli wrote:
> manpages.mk is generated at build-time using sodepends.py and so there is no
> need to keep it in git.
> 
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> ---

Hi.

This change breaks the distcheck target:


ERROR: files left in build directory after distclean:
./manpages.mk.tmp
Makefile:5315: recipe for target 'distcleancheck' failed

Here is the full log:
https://travis-ci.org/github/ovsrobot/ovs/jobs/715128118

Best regards, Ilya Maximets.
diff mbox series

Patch

diff --git a/.gitignore b/.gitignore
index 2ac9cdac7..f1cdcf124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ 
 /docs-check
 /install-sh
 /libtool
+/manpages.mk
 /manpage-check
 /missing
 /missing-distfiles
diff --git a/Makefile.am b/Makefile.am
index 27ef9e4b4..8ead17029 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -412,7 +412,7 @@  flake8-check: $(FLAKE8_PYFILES)
 endif
 CLEANFILES += flake8-check
 
-include $(srcdir)/manpages.mk
+-include $(srcdir)/manpages.mk
 $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/build/soutil.py
 	@PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
 	@if cmp -s $(@F).tmp $@; then \
diff --git a/manpages.mk b/manpages.mk
deleted file mode 100644
index dc201484c..000000000
--- a/manpages.mk
+++ /dev/null
@@ -1,266 +0,0 @@ 
-# Generated automatically -- do not modify!    -*- buffer-read-only: t -*-
-
-ovsdb/ovsdb-client.1: \
-	ovsdb/ovsdb-client.1.in \
-	lib/common-syn.man \
-	lib/common.man \
-	lib/daemon-syn.man \
-	lib/daemon.man \
-	lib/ovs.tmac \
-	lib/ssl-bootstrap-syn.man \
-	lib/ssl-bootstrap.man \
-	lib/ssl-connect-syn.man \
-	lib/ssl-connect.man \
-	lib/ssl-syn.man \
-	lib/ssl.man \
-	lib/table.man \
-	lib/vlog-syn.man \
-	lib/vlog.man \
-	ovsdb/ovsdb-schemas.man
-ovsdb/ovsdb-client.1.in:
-lib/common-syn.man:
-lib/common.man:
-lib/daemon-syn.man:
-lib/daemon.man:
-lib/ovs.tmac:
-lib/ssl-bootstrap-syn.man:
-lib/ssl-bootstrap.man:
-lib/ssl-connect-syn.man:
-lib/ssl-connect.man:
-lib/ssl-syn.man:
-lib/ssl.man:
-lib/table.man:
-lib/vlog-syn.man:
-lib/vlog.man:
-ovsdb/ovsdb-schemas.man:
-
-ovsdb/ovsdb-server.1: \
-	ovsdb/ovsdb-server.1.in \
-	lib/common-syn.man \
-	lib/common.man \
-	lib/coverage-unixctl.man \
-	lib/daemon-syn.man \
-	lib/daemon.man \
-	lib/memory-unixctl.man \
-	lib/ovs.tmac \
-	lib/service-syn.man \
-	lib/service.man \
-	lib/ssl-bootstrap-syn.man \
-	lib/ssl-bootstrap.man \
-	lib/ssl-connect-syn.man \
-	lib/ssl-connect.man \
-	lib/ssl-peer-ca-cert-syn.man \
-	lib/ssl-peer-ca-cert.man \
-	lib/ssl-syn.man \
-	lib/ssl.man \
-	lib/unixctl-syn.man \
-	lib/unixctl.man \
-	lib/vlog-syn.man \
-	lib/vlog-unixctl.man \
-	lib/vlog.man
-ovsdb/ovsdb-server.1.in:
-lib/common-syn.man:
-lib/common.man:
-lib/coverage-unixctl.man:
-lib/daemon-syn.man:
-lib/daemon.man:
-lib/memory-unixctl.man:
-lib/ovs.tmac:
-lib/service-syn.man:
-lib/service.man:
-lib/ssl-bootstrap-syn.man:
-lib/ssl-bootstrap.man:
-lib/ssl-connect-syn.man:
-lib/ssl-connect.man:
-lib/ssl-peer-ca-cert-syn.man:
-lib/ssl-peer-ca-cert.man:
-lib/ssl-syn.man:
-lib/ssl.man:
-lib/unixctl-syn.man:
-lib/unixctl.man:
-lib/vlog-syn.man:
-lib/vlog-unixctl.man:
-lib/vlog.man:
-
-ovsdb/ovsdb-tool.1: \
-	ovsdb/ovsdb-tool.1.in \
-	lib/common-syn.man \
-	lib/common.man \
-	lib/ovs.tmac \
-	lib/vlog-syn.man \
-	lib/vlog.man \
-	ovsdb/ovsdb-schemas.man
-ovsdb/ovsdb-tool.1.in:
-lib/common-syn.man:
-lib/common.man:
-lib/ovs.tmac:
-lib/vlog-syn.man:
-lib/vlog.man:
-ovsdb/ovsdb-schemas.man:
-
-utilities/bugtool/ovs-bugtool.8: \
-	utilities/bugtool/ovs-bugtool.8.in \
-	lib/ovs.tmac
-utilities/bugtool/ovs-bugtool.8.in:
-lib/ovs.tmac:
-
-
-utilities/ovs-dpctl-top.8: \
-	utilities/ovs-dpctl-top.8.in \
-	lib/ovs.tmac
-utilities/ovs-dpctl-top.8.in:
-lib/ovs.tmac:
-
-utilities/ovs-dpctl.8: \
-	utilities/ovs-dpctl.8.in \
-	lib/common.man \
-	lib/dpctl.man \
-	lib/ovs.tmac \
-	lib/vlog.man
-utilities/ovs-dpctl.8.in:
-lib/common.man:
-lib/dpctl.man:
-lib/ovs.tmac:
-lib/vlog.man:
-
-utilities/ovs-ofctl.8: \
-	utilities/ovs-ofctl.8.in \
-	lib/colors.man \
-	lib/common.man \
-	lib/daemon.man \
-	lib/ofp-version.man \
-	lib/ovs.tmac \
-	lib/ssl.man \
-	lib/unixctl.man \
-	lib/vconn-active.man \
-	lib/vlog.man
-utilities/ovs-ofctl.8.in:
-lib/colors.man:
-lib/common.man:
-lib/daemon.man:
-lib/ofp-version.man:
-lib/ovs.tmac:
-lib/ssl.man:
-lib/unixctl.man:
-lib/vconn-active.man:
-lib/vlog.man:
-
-utilities/ovs-pcap.1: \
-	utilities/ovs-pcap.1.in \
-	lib/common-syn.man \
-	lib/common.man \
-	lib/ovs.tmac
-utilities/ovs-pcap.1.in:
-lib/common-syn.man:
-lib/common.man:
-lib/ovs.tmac:
-
-lib/ovs.tmac:
-
-utilities/ovs-testcontroller.8: \
-	utilities/ovs-testcontroller.8.in \
-	lib/common.man \
-	lib/daemon.man \
-	lib/ofp-version.man \
-	lib/ovs.tmac \
-	lib/ssl-peer-ca-cert.man \
-	lib/ssl.man \
-	lib/unixctl.man \
-	lib/vconn-active.man \
-	lib/vconn-passive.man \
-	lib/vlog.man
-utilities/ovs-testcontroller.8.in:
-lib/common.man:
-lib/daemon.man:
-lib/ofp-version.man:
-lib/ovs.tmac:
-lib/ssl-peer-ca-cert.man:
-lib/ssl.man:
-lib/unixctl.man:
-lib/vconn-active.man:
-lib/vconn-passive.man:
-lib/vlog.man:
-
-utilities/ovs-vsctl.8: \
-	utilities/ovs-vsctl.8.in \
-	lib/common.man \
-	lib/db-ctl-base.man \
-	lib/ovs.tmac \
-	lib/ssl-bootstrap.man \
-	lib/ssl-peer-ca-cert.man \
-	lib/ssl.man \
-	lib/table.man \
-	lib/vconn-active.man \
-	lib/vconn-passive.man \
-	lib/vlog.man
-utilities/ovs-vsctl.8.in:
-lib/common.man:
-lib/db-ctl-base.man:
-lib/ovs.tmac:
-lib/ssl-bootstrap.man:
-lib/ssl-peer-ca-cert.man:
-lib/ssl.man:
-lib/table.man:
-lib/vconn-active.man:
-lib/vconn-passive.man:
-lib/vlog.man:
-
-vswitchd/ovs-vswitchd.8: \
-	vswitchd/ovs-vswitchd.8.in \
-	lib/common.man \
-	lib/coverage-unixctl.man \
-	lib/daemon.man \
-	lib/dpctl.man \
-	lib/dpif-netdev-unixctl.man \
-	lib/memory-unixctl.man \
-	lib/netdev-dpdk-unixctl.man \
-	lib/ovs.tmac \
-	lib/service.man \
-	lib/ssl-bootstrap.man \
-	lib/ssl-peer-ca-cert.man \
-	lib/ssl.man \
-	lib/unixctl.man \
-	lib/vlog-unixctl.man \
-	lib/vlog.man \
-	ofproto/ofproto-dpif-unixctl.man \
-	ofproto/ofproto-tnl-unixctl.man \
-	ofproto/ofproto-unixctl.man
-vswitchd/ovs-vswitchd.8.in:
-lib/common.man:
-lib/coverage-unixctl.man:
-lib/daemon.man:
-lib/dpctl.man:
-lib/dpif-netdev-unixctl.man:
-lib/memory-unixctl.man:
-lib/netdev-dpdk-unixctl.man:
-lib/ovs.tmac:
-lib/service.man:
-lib/ssl-bootstrap.man:
-lib/ssl-peer-ca-cert.man:
-lib/ssl.man:
-lib/unixctl.man:
-lib/vlog-unixctl.man:
-lib/vlog.man:
-ofproto/ofproto-dpif-unixctl.man:
-ofproto/ofproto-tnl-unixctl.man:
-ofproto/ofproto-unixctl.man:
-
-vtep/vtep-ctl.8: \
-	vtep/vtep-ctl.8.in \
-	lib/common.man \
-	lib/db-ctl-base.man \
-	lib/ovs.tmac \
-	lib/ssl-bootstrap.man \
-	lib/ssl-peer-ca-cert.man \
-	lib/ssl.man \
-	lib/table.man \
-	lib/vlog.man
-vtep/vtep-ctl.8.in:
-lib/common.man:
-lib/db-ctl-base.man:
-lib/ovs.tmac:
-lib/ssl-bootstrap.man:
-lib/ssl-peer-ca-cert.man:
-lib/ssl.man:
-lib/table.man:
-lib/vlog.man: