diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2020-03-23 15:04:40 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2020-03-23 16:07:24 +0800 |
| commit | bf4f584e75bd831eb16c8ef4b96c93f124ea5453 (patch) | |
| tree | ad3c1614f6bb33c79e3b9e67c03e846e862fb71f /net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch | |
| parent | f426ad6acc182de3b6413a20cd187660630c70b7 (diff) | |
openvswitch: bump to version 2.13.0
python2 library is now removed as the transition has been done by the
upstream project
OVN is now a separate project released with its own release plan and
it's not included within openvswitch starting with ovs 2.13.
openvswitch.mk is split out from the main Makefile for adding ovn
packages back in following commits.
The following two patches are already included in 2.13
- ovsdb-idlc-fix-dict-change-during-iteration.patch
- compat-Include-confirm_neigh-parameter-if-needed.patch
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch')
| -rw-r--r-- | net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch index 73f40ff31..a760cd5a2 100644 --- a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch +++ b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch @@ -1,41 +1,37 @@ -From e2d9b5d6fc33d7b9cbb7dc16832c5c86e6470966 Mon Sep 17 00:00:00 2001 -From: Yousong Zhou <zhouyousong@yunionyun.com> -Date: Tue, 21 Aug 2018 12:21:05 +0000 -Subject: [PATCH 2/4] python: separate host/target python for cross-compile - -At the moment, python-six is a requirement for openvswitch python -library on target machine. +From c17f9e73b543043b438dee6759ae20047ee33d4a Mon Sep 17 00:00:00 2001 +From: Yousong Zhou <yszhou4tech@gmail.com> +Date: Fri, 20 Mar 2020 15:11:31 +0800 +Subject: [PATCH] python: separate host/target python for cross-compile Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> --- Makefile.am | 2 +- - m4/openvswitch.m4 | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) + m4/openvswitch.m4 | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index ff1f94b48..417f53230 100644 +index b279303d1..6140b2c7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,7 @@ endif # foo/__init__.pyc will cause Python to ignore foo.py. run_python = \ PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \ -- PYTHONDONTWRITEBYTECODE=yes $(PYTHON) -+ PYTHONDONTWRITEBYTECODE=yes $(PYTHON_HOST) +- PYTHONDONTWRITEBYTECODE=yes $(PYTHON3) ++ PYTHONDONTWRITEBYTECODE=yes $(PYTHON3_HOST) ALL_LOCAL = BUILT_SOURCES = diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 -index cd6b51d86..6dc9d630b 100644 +index add3aabcc..839eb7bda 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 -@@ -456,7 +456,9 @@ AC_DEFUN([OVS_CHECK_PYTHON], - fi]) - AC_SUBST([PYTHON]) - PYTHON=$ovs_cv_python -+ PYTHON_HOST=$ovs_cv_python_host - AC_SUBST([HAVE_PYTHON]) -+ AM_MISSING_PROG([PYTHON_HOST], [python]) - HAVE_PYTHON=yes - AM_CONDITIONAL([HAVE_PYTHON], [test "$HAVE_PYTHON" = yes])]) +@@ -383,6 +383,8 @@ else: + AC_MSG_ERROR([Python 3.4 or later is required but not found in $PATH, please install it or set $PYTHON3 to point to it]) + fi + AC_ARG_VAR([PYTHON3]) ++ PYTHON3_HOST=$ovs_cv_python3_host ++ AM_MISSING_PROG([PYTHON3_HOST], [python3]) + PYTHON3=$ovs_cv_python3]) + dnl Checks for flake8. |