Certain platforms like xenserver do not have the latest python libraries that are needed by ovsdb-doc (which in-turn creates ovs-vswitchd.conf.db.5). When we run 'make dist' and copy over the tar ball to xenserver ddk environemt, we already include ovs-vswitchd.conf.db.5. But the absence of ovsdb-doc results in an attempt to regenerate ovs-vswitchd.conf.db.5 and that fails because of the missing python libraries.
We work-around the problem by including the ovsdb-doc as part of the distribution tar ball. Signed-off-by: Gurucharan Shetty <[email protected]> --- ovsdb/automake.mk | 7 +++++-- vswitchd/automake.mk | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk index 448bbf7..25f2d3c 100644 --- a/ovsdb/automake.mk +++ b/ovsdb/automake.mk @@ -89,10 +89,13 @@ BUILT_SOURCES += $(OVSIDL_BUILT) $(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in # ovsdb-doc -EXTRA_DIST += ovsdb/ovsdb-doc.in +EXTRA_DIST += ovsdb/ovsdb-doc.in ovsdb/ovsdb-doc noinst_SCRIPTS += ovsdb/ovsdb-doc DISTCLEANFILES += ovsdb/ovsdb-doc -OVSDB_DOC = $(run_python) $(builddir)/ovsdb/ovsdb-doc +OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc +$(srcdir)/ovsdb/ovsdb-doc: $(srcdir)/ovsdb/ovsdb-doc.in + sed -e 's,[@]PYTHON[@],$(PYTHON),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' $< > $@ && chmod +x $@ # ovsdb-dot EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk index 3d8ac62..026db5d 100644 --- a/vswitchd/automake.mk +++ b/vswitchd/automake.mk @@ -57,6 +57,7 @@ EXTRA_DIST += vswitchd/vswitch.gv vswitchd/vswitch.pic # vswitch schema documentation EXTRA_DIST += vswitchd/vswitch.xml +DISTCLEANFILES += vswitchd/ovs-vswitchd.conf.db.5 dist_man_MANS += vswitchd/ovs-vswitchd.conf.db.5 $(srcdir)/vswitchd/ovs-vswitchd.conf.db.5: \ ovsdb/ovsdb-doc vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \ -- 1.7.9.5 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
