[ovs-dev] [PATCH] ovs-ctl: Install manpage.

Ben Pfaff blp at nicira.com
Thu May 1 15:10:15 UTC 2014


On Thu, Apr 24, 2014 at 04:03:46PM -0700, Gurucharan Shetty wrote:
> On Fri, Apr 11, 2014 at 11:18 AM, Ben Pfaff <blp at nicira.com> wrote:
> > It seems that it is useful to admins after all.
> >
> > Reported-by: Brian Candler <b.candler at pobox.com>
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> >  debian/openvswitch-switch.manpages |    1 +
> >  rhel/openvswitch-fedora.spec.in    |    3 ++-
> >  utilities/automake.mk              |    2 +-
> >  3 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/debian/openvswitch-switch.manpages b/debian/openvswitch-switch.manpages
> > index bfcf1d9..0040794 100644
> > --- a/debian/openvswitch-switch.manpages
> > +++ b/debian/openvswitch-switch.manpages
> > @@ -1,4 +1,5 @@
> >  _debian/ovsdb/ovsdb-server.1
> > +_debian/utilities/ovs-ctl.8
> >  _debian/utilities/ovs-dpctl.8
> >  _debian/utilities/ovs-dpctl-top.8
> >  _debian/utilities/ovs-pcap.1
> 
> I get the following error when I run:
> dh_installinit -R
> dh_installcron
> dh_installman --language=C
> _debian/utilities/ovs-ctl.8: No such file or directory at
> /usr/bin/dh_installman line 127, <IN> line 243.
> make[1]: *** [binary-common] Error 2
> make[1]: Leaving directory `/root/git/openvswitch'
> make: *** [binary-arch] Error 2
> 
> This works for me:
> diff --git a/debian/openvswitch-switch.manpages
> b/debian/openvswitch-switch.manpages
> index 0040794..f30358b 100644
> --- a/debian/openvswitch-switch.manpages
> +++ b/debian/openvswitch-switch.manpages
> @@ -1,5 +1,5 @@
>  _debian/ovsdb/ovsdb-server.1
> -_debian/utilities/ovs-ctl.8
> +utilities/ovs-ctl.8
>  _debian/utilities/ovs-dpctl.8
>  _debian/utilities/ovs-dpctl-top.8
>  _debian/utilities/ovs-pcap.1
> 
> 
> 
> > diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
> > index 19fa154..fb6feb6 100644
> > --- a/rhel/openvswitch-fedora.spec.in
> > +++ b/rhel/openvswitch-fedora.spec.in
> > @@ -1,6 +1,6 @@
> >  # Spec file for Open vSwitch.
> >
> > -# Copyright (C) 2009, 2010, 2013 Nicira Networks, Inc.
> > +# Copyright (C) 2009, 2010, 2013, 2014 Nicira Networks, Inc.
> >  #
> >  # Copying and distribution of this file, with or without modification,
> >  # are permitted in any medium without royalty provided the copyright
> > @@ -175,6 +175,7 @@ systemctl start openvswitch.service
> >  %doc /usr/share/man/man5/vtep.5.gz
> >  %doc /usr/share/man/man8/ovs-appctl.8.gz
> >  %doc /usr/share/man/man8/ovs-bugtool.8.gz
> > +%doc /usr/share/man/man8/ovs-ctl.8.gz
> There is a exclude for the same file some lines below. I think it
> needs to be removed.
> 
> >  %doc /usr/share/man/man8/ovs-dpctl.8.gz
> >  %doc /usr/share/man/man8/ovs-dpctl-top.8.gz
> >  %doc /usr/share/man/man8/ovs-ofctl.8.gz
> > diff --git a/utilities/automake.mk b/utilities/automake.mk
> > index ce1c8b2..3e38e37 100644
> > --- a/utilities/automake.mk
> > +++ b/utilities/automake.mk
> > @@ -82,6 +82,7 @@ DISTCLEANFILES += \
> >  man_MANS += \
> >         utilities/ovs-appctl.8 \
> >         utilities/ovs-benchmark.1 \
> > +       utilities/ovs-ctl.8 \
> >         utilities/ovs-dpctl.8 \
> >         utilities/ovs-dpctl-top.8 \
> >         utilities/ovs-l3ping.8 \
> > @@ -94,7 +95,6 @@ man_MANS += \
> >         utilities/ovs-test.8 \
> >         utilities/ovs-vlan-test.8 \
> >         utilities/ovs-vsctl.8
> > -dist_man_MANS += utilities/ovs-ctl.8
> >
> >  utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c
> >  utilities_ovs_appctl_LDADD = lib/libopenvswitch.la

Thanks for both those fixes.  I'll apply this to master in a minute.



More information about the dev mailing list