[ovs-dev,ovn] build: ensure python3 is used for all python scripts
diff mbox series

Message ID 20200213194408.68188-1-numans@ovn.org
State Accepted
Headers show
Series
  • [ovs-dev,ovn] build: ensure python3 is used for all python scripts
Related show

Commit Message

Numan Siddique Feb. 13, 2020, 7:44 p.m. UTC
From: James Page <james.page@ubuntu.com>

As OVN is Python 3 only ensure that the build process only
uses PYTHON3 and not PYTHON.

Signed-off-by: James Page <james.page@ubuntu.com>
---
 automake.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Numan Siddique Feb. 13, 2020, 7:59 p.m. UTC | #1
On Fri, Feb 14, 2020 at 1:14 AM <numans@ovn.org> wrote:
>
> From: James Page <james.page@ubuntu.com>
>
> As OVN is Python 3 only ensure that the build process only
> uses PYTHON3 and not PYTHON.
>
> Signed-off-by: James Page <james.page@ubuntu.com>

This patch was submitted as PR here - https://github.com/ovn-org/ovn/pull/34

I applied this to master.

Thanks
Numan

> ---
>  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) > $@.tmp && \
> +       $(AM_V_GEN)(dot -T plain < ovn-ic-nb.gv | $(PYTHON3) ${OVSDIR}/ovsdb/dot2pic -f 3) > $@.tmp && \
>         mv $@.tmp $@
>  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) > $@.tmp && \
> +       $(AM_V_GEN)(dot -T plain < ovn-ic-sb.gv | $(PYTHON3) ${OVSDIR}/ovsdb/dot2pic -f 3) > $@.tmp && \
>         mv $@.tmp $@
>  OVN_IC_SB_PIC = ovn-ic-sb.pic
>  OVN_IC_SB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_IC_SB_PIC)
> --
> 2.24.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>

Patch
diff mbox series

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) > $@.tmp && \
+	$(AM_V_GEN)(dot -T plain < ovn-ic-nb.gv | $(PYTHON3) ${OVSDIR}/ovsdb/dot2pic -f 3) > $@.tmp && \
 	mv $@.tmp $@
 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) > $@.tmp && \
+	$(AM_V_GEN)(dot -T plain < ovn-ic-sb.gv | $(PYTHON3) ${OVSDIR}/ovsdb/dot2pic -f 3) > $@.tmp && \
 	mv $@.tmp $@
 OVN_IC_SB_PIC = ovn-ic-sb.pic
 OVN_IC_SB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_IC_SB_PIC)