Message ID | 20190808125815.20104-1-nusiddiq@redhat.com |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev,ovn] Add OVN schema version checks in Makefile.am | expand |
On Thu, Aug 8, 2019 at 5:58 AM <nusiddiq@redhat.com> wrote: > > From: Numan Siddique <nusiddiq@redhat.com> > > This was left out during the OVS/OVN split. > > We still need to handle the below in the automake files > - OVN northbound/southbound E-R diagram > - OVN northbound/southbound schema documentation > - ovn-architecture manpage generation. Shall we add these to split-TODOs so that we don't forget? > > The above requires some amount of work (mainly in pointing to the correct > path for ovsdb-doc/ovsdb-dot.in) and will be added in a separate patch. > > OVN schema version checks is very important and hence only that is considered > in this patch. > > Signed-off-by: Numan Siddique <nusiddiq@redhat.com> > --- > Makefile.am | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > index 16d4d02e4..f886a8e63 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -490,6 +490,20 @@ dist-docs: > VERSION=$(VERSION) MAKE='$(MAKE)' $(srcdir)/build-aux/dist-docs $(srcdir) $(docs) > .PHONY: dist-docs > > + > +# Version checking for ovn-nb.ovsschema. > +ALL_LOCAL += ovn-nb.ovsschema.stamp > +ovn-nb.ovsschema.stamp: ovn-nb.ovsschema > + $(srcdir)/build-aux/cksum-schema-check $? $@ > +CLEANFILES += ovn-nb.ovsschema.stamp > + > +# Version checking for ovn-sb.ovsschema. > +ALL_LOCAL += ovn-sb.ovsschema.stamp > +ovn-sb.ovsschema.stamp: ovn-sb.ovsschema > + $(srcdir)/build-aux/cksum-schema-check $? $@ > + > +CLEANFILES += ovn-sb.ovsschema.stamp > + > include Documentation/automake.mk > include m4/automake.mk > include lib/automake.mk > -- > 2.21.0 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev Acked-by: Han Zhou <hzhou8@ebay.com>
On Thu, Aug 8, 2019 at 10:48 PM Han Zhou <zhouhan@gmail.com> wrote: > > > On Thu, Aug 8, 2019 at 5:58 AM <nusiddiq@redhat.com> wrote: > > > > From: Numan Siddique <nusiddiq@redhat.com> > > > > This was left out during the OVS/OVN split. > > > > We still need to handle the below in the automake files > > - OVN northbound/southbound E-R diagram > > - OVN northbound/southbound schema documentation > > - ovn-architecture manpage generation. > > Shall we add these to split-TODOs so that we don't forget? > > I do have this in mind. I will not forget this :). I added below to TODO_split.rst and applied to master *********** diff --git a/TODO_SPLIT.rst b/TODO_SPLIT.rst index 5d32c4b9e..bda0ff862 100644 --- a/TODO_SPLIT.rst +++ b/TODO_SPLIT.rst @@ -35,6 +35,12 @@ Immediate tasks * Someone with a decent ability to write should give the README.rst file some polish (or even just rewrite it. I won't be offended). +* After the split, the below things are missing during compilation + - OVN northbound/southbound E-R diagram + - OVN northbound/southbound schema documentation + - ovn-architecture manpage generation. + This needs to be fixed. + ********* > > > > The above requires some amount of work (mainly in pointing to the correct > > path for ovsdb-doc/ovsdb-dot.in) and will be added in a separate patch. > > > > OVN schema version checks is very important and hence only that is > considered > > in this patch. > > > > Signed-off-by: Numan Siddique <nusiddiq@redhat.com> > > --- > > Makefile.am | 14 ++++++++++++++ > > 1 file changed, 14 insertions(+) > > > > diff --git a/Makefile.am b/Makefile.am > > index 16d4d02e4..f886a8e63 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -490,6 +490,20 @@ dist-docs: > > VERSION=$(VERSION) MAKE='$(MAKE)' $(srcdir)/build-aux/dist-docs > $(srcdir) $(docs) > > .PHONY: dist-docs > > > > + > > +# Version checking for ovn-nb.ovsschema. > > +ALL_LOCAL += ovn-nb.ovsschema.stamp > > +ovn-nb.ovsschema.stamp: ovn-nb.ovsschema > > + $(srcdir)/build-aux/cksum-schema-check $? $@ > > +CLEANFILES += ovn-nb.ovsschema.stamp > > + > > +# Version checking for ovn-sb.ovsschema. > > +ALL_LOCAL += ovn-sb.ovsschema.stamp > > +ovn-sb.ovsschema.stamp: ovn-sb.ovsschema > > + $(srcdir)/build-aux/cksum-schema-check $? $@ > > + > > +CLEANFILES += ovn-sb.ovsschema.stamp > > + > > include Documentation/automake.mk > > include m4/automake.mk > > include lib/automake.mk > > -- > > 2.21.0 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > Acked-by: Han Zhou <hzhou8@ebay.com> >
diff --git a/Makefile.am b/Makefile.am index 16d4d02e4..f886a8e63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -490,6 +490,20 @@ dist-docs: VERSION=$(VERSION) MAKE='$(MAKE)' $(srcdir)/build-aux/dist-docs $(srcdir) $(docs) .PHONY: dist-docs + +# Version checking for ovn-nb.ovsschema. +ALL_LOCAL += ovn-nb.ovsschema.stamp +ovn-nb.ovsschema.stamp: ovn-nb.ovsschema + $(srcdir)/build-aux/cksum-schema-check $? $@ +CLEANFILES += ovn-nb.ovsschema.stamp + +# Version checking for ovn-sb.ovsschema. +ALL_LOCAL += ovn-sb.ovsschema.stamp +ovn-sb.ovsschema.stamp: ovn-sb.ovsschema + $(srcdir)/build-aux/cksum-schema-check $? $@ + +CLEANFILES += ovn-sb.ovsschema.stamp + include Documentation/automake.mk include m4/automake.mk include lib/automake.mk