Hi Timothy,
It looks like some wires got crossed here. commit ff39e6c5 from James
Page fixed this in master, but the fix was not backported to the 20.03
branch. I'm going to backport the existing commit to 20.03.
On 2/18/20 12:53 PM, Timothy Redaelli wrote:
Currently $(PYTHON) is used in order to launch dot2pic script to generate
the diagram, but this is wrong since PYTHON variable is NOT defined by
the build system and so it fails when "python" binary doesn't exists
(like on RHEL8).
This commit fixes this by using the correct PYTHON3 variable that is
defined by the build system (in OVN_CHECK_PYTHON3).
Fixes: 2992f74bf515 ("ovn-ic-nb: Interconnection northbound DB schema and CLI.")
Fixes: 1c3c4108e602 ("ovn-ic-sb: Interconnection southbound DB schema and CLI.")
Cc: [email protected]
Signed-off-by: Timothy Redaelli <[email protected]>
---
automake.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/automake.mk b/automake.mk
index 2b0bb4b12..a7947a3f5 100644
--- a/automake.mk
+++ b/automake.mk
@@ -70,7 +70,7 @@ if HAVE_DOT
ovn-ic-nb.gv: ${OVSDIR}/ovsdb/ovsdb-dot.in $(srcdir)/ovn-ic-nb.ovsschema
$(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/ovn-ic-nb.ovsschema > $@
ovn-ic-nb.pic: ovn-ic-nb.gv ${OVSDIR}/ovsdb/dot2pic
- $(AM_V_GEN)(dot -T plain < ovn-ic-nb.gv | $(PYTHON) ${OVSDIR}/ovsdb/dot2pic -f 3)
> [email protected] && \
+ $(AM_V_GEN)(dot -T plain < ovn-ic-nb.gv | $(PYTHON3) ${OVSDIR}/ovsdb/dot2pic -f 3)
> [email protected] && \
mv [email protected] $@
OVN_IC_NB_PIC = ovn-ic-nb.pic
OVN_IC_NB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_IC_NB_PIC)
@@ -99,7 +99,7 @@ if HAVE_DOT
ovn-ic-sb.gv: ${OVSDIR}/ovsdb/ovsdb-dot.in $(srcdir)/ovn-ic-sb.ovsschema
$(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/ovn-ic-sb.ovsschema > $@
ovn-ic-sb.pic: ovn-ic-sb.gv ${OVSDIR}/ovsdb/dot2pic
- $(AM_V_GEN)(dot -T plain < ovn-ic-sb.gv | $(PYTHON) ${OVSDIR}/ovsdb/dot2pic -f 3)
> [email protected] && \
+ $(AM_V_GEN)(dot -T plain < ovn-ic-sb.gv | $(PYTHON3) ${OVSDIR}/ovsdb/dot2pic -f 3)
> [email protected] && \
mv [email protected] $@
OVN_IC_SB_PIC = ovn-ic-sb.pic
OVN_IC_SB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_IC_SB_PIC)
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
