On Mon, Oct 14, 2013 at 05:56:40PM -0700, Ansis Atteka wrote:
> These are auto-generated files, so it would be better not to keep them
> inside Open vSwitch repository.
> 
> Behaviour before this patch was that if dot tool was not present on
> the system, then ovs-vswitchd.conf.db.5 would have used pre-generated
> vswitch.pic file that was already checked in the git repository. After
> this patch ovs-vswitchd.conf.db.5 will simply not have a dot diagram,
> if dot was not present at the time when Open vSwitch was built.
> 
> Signed-off-by: Ansis Atteka <aatt...@nicira.com>

This should probably update part of INSTALL, from

    If you modify the vswitchd database schema, then the E-R diagram in
    the ovs-vswitchd.conf.db(5) manpage will be updated properly only if
    you have the following:

to e.g.

    The ovs-vswitchd.conf.db(5) manpage will include an E-R diagram, in
    formats other than plain text, only if you have the following:

I'd also make sure that the Debian packages get the diagrams, with:

    diff --git a/debian/control b/debian/control
    index 46b5630..713ebaf 100644
    --- a/debian/control
    +++ b/debian/control
    @@ -5,7 +5,7 @@ Maintainer: Open vSwitch developers <dev@openvswitch.org>
     Uploaders: Ben Pfaff <pfaff...@debian.org>, Simon Horman <ho...@debian.org>
     Build-Depends:
      debhelper (>= 8), autoconf (>= 2.64), automake (>= 1.10) | automake1.10, 
    - libssl-dev, bzip2, openssl,
    + libssl-dev, bzip2, openssl, graphviz,
      python-all (>= 2.6.6-3~), procps, python-qt4,
      python-zopeinterface, python-twisted-conch
     Standards-Version: 3.9.3

Presumably we should add a RHEL BuildRequires too.

I think XenServer is just out of luck.

I think that we can now remove the checksum logic in
vswitchd/automake.mk to avoid updating vswitch.gv and vswitch.pic when
graphviz versions change: it doesn't matter anymore since we're not
checking those files into Git.

Thanks,

Ben.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to