[ovs-dev] [PATCH] vtep: Move vtep IDL files into new "libvtep.la".

[Ben Pfaff]

On Thu, Mar 05, 2015 at 12:58:33PM -0800, Justin Pettit wrote:
> 
> > On Mar 5, 2015, at 8:58 AM, Ben Pfaff <blp at nicira.com> wrote:
> > 
> > On Thu, Mar 05, 2015 at 12:04:29AM -0800, Justin Pettit wrote:
> >> There's no reason to build it in "lib" and include it in
> >> "libopenvswitch.la".  This commit moves it to "vtep" and includes it in
> >> a new "libvtep.la".
> >> 
> >> Signed-off-by: Justin Pettit <jpettit at nicira.com>
> > 
> > I get a build failure when I apply this:
> > 
> >    make: Entering directory '/home/blp/nicira/ovs/_build'
> >    PYTHONPATH=../python":"$PYTHONPATH PYTHONDONTWRITEBYTECODE=yes /usr/bin/python ../ovsdb/ovsdb-idlc.in annotate vtep/vtep.ovsschema vtep/vtep-idl.ann > vtep/vtep-idl.ovsidl.tmp && \
> >    mv vtep/vtep-idl.ovsidl.tmp vtep/vtep-idl.ovsidl
> >    Traceback (most recent call last):
> >      File "../ovsdb/ovsdb-idlc.in", line 866, in <module>
> >        func(*args[1:])
> >      File "../ovsdb/ovsdb-idlc.in", line 18, in annotateSchema
> >        schemaJson = ovs.json.from_file(schemaFile)
> >      File "/home/blp/nicira/ovs/python/ovs/json.py", line 136, in from_file
> >        stream = open(name, "r")
> >    IOError: [Errno 2] No such file or directory: 'vtep/vtep.ovsschema'
> >    Makefile:5307: recipe for target 'vtep/vtep-idl.ovsidl' failed
> >    make: *** [vtep/vtep-idl.ovsidl] Error 1
> >    make: Target 'all' not remade because of errors.
> >    make: Leaving directory '/home/blp/nicira/ovs/_build'
> 
> I checked out a new tree and applied the patch, and it worked fine for me.  I didn't move "vtep/vtep.ovsschema" from where it was before the patch, so I don't know why the file wouldn't exist.  Can you take another look at your system just to make sure there's nothing off about your tree?

I guess you build in your source directory.  Fix:

diff --git a/vtep/automake.mk b/vtep/automake.mk
index 494a225..7892685 100644
--- a/vtep/automake.mk
+++ b/vtep/automake.mk
@@ -5,8 +5,8 @@ OVSIDL_BUILT += \
 	vtep/vtep.ovsidl
 EXTRA_DIST += vtep/vtep-idl.ann
 VTEP_IDL_FILES = \
-	vtep/vtep.ovsschema \
-	vtep/vtep-idl.ann
+	$(srcdir)/vtep/vtep.ovsschema \
+	$(srcdir)/vtep/vtep-idl.ann
 vtep/vtep-idl.ovsidl: $(VTEP_IDL_FILES)
 	$(AM_V_GEN)$(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp && \
 	mv $@.tmp $@
@@ -70,7 +70,7 @@ EXTRA_DIST += vtep/vtep.xml
 DISTCLEANFILES += vtep/vtep.5
 man_MANS += vtep/vtep.5
 vtep/vtep.5: \
-	ovsdb/ovsdb-doc vtep/vtep.xml vtep/vtep.ovsschema $(VTEP_PIC)
+	ovsdb/ovsdb-doc vtep/vtep.xml $(srcdir)/vtep/vtep.ovsschema $(VTEP_PIC)
 	$(AM_V_GEN)$(OVSDB_DOC) \
 		$(VTEP_DOT_DIAGRAM_ARG) \
 		--version=$(VERSION) \