OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
packages/net/openvswitch/patches/0002-python-separate-host-t...

52 lines
1.9 KiB
Diff
Raw Normal View History

openvswitch: bump to version 2.14.0 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2020-08-25 11:47:16 +08:00
From 54484e79aca0981ebc42ddc68487e6531da9b59d Mon Sep 17 00:00:00 2001
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>
2020-03-23 15:04:40 +08:00
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
openvswitch: python: rework host and target dependency Open vSwitch needs to run python on build machine to make build-time required files. python-six library is only required by the openvswitch python library on target machine, not a build dependency. We override host PYTHONPATH by overriding it in MAKE_VARS. This way we can remove 0003-override-pythonpath-via-make-vars.patch This also fixes shebang wrongly pointing to python on host Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-02-28 13:22:20 +08:00
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
openvswitch: bump to version 2.10.0 - Rebased the python target/host separation patch - Dropped the now-in-upstream openssl-1.1 compat patch - Added a patch to disable tests/ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-08-21 08:39:58 +08:00
Makefile.am | 2 +-
openvswitch: pass KERNEL_MAKE_FLAGS for reproducible build Reported-by: Paul Spooren <mail@aparcar.org> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2020-05-26 22:54:49 +08:00
m4/openvswitch.m4 | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
openvswitch: python: rework host and target dependency Open vSwitch needs to run python on build machine to make build-time required files. python-six library is only required by the openvswitch python library on target machine, not a build dependency. We override host PYTHONPATH by overriding it in MAKE_VARS. This way we can remove 0003-override-pythonpath-via-make-vars.patch This also fixes shebang wrongly pointing to python on host Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-02-28 13:22:20 +08:00
--- a/Makefile.am
+++ b/Makefile.am
openvswitch: rework packaging New scheme mainly provides three packages: openvswitch, openvswitch-ovn-north, openvswitch-ovn-controller. These should fit most usage scenarios. Other subpackages like openvswitch-libXXX etc. are there for dependency management and are hidden from the menu. Many python and shell scripts are removed in this revision. Most of them cannot run out of box at all for lack of dependencies. Others being legacy ones are not that useful now. Add them back at later time when real need appears Below are a simple listing of additions - initscript now incorporate also ovn north and controller support - ovn-ctl and ovs-ctl can be invoked directly from within $PATH Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-28 18:21:38 +08:00
@@ -60,7 +60,7 @@ endif
openvswitch: python: rework host and target dependency Open vSwitch needs to run python on build machine to make build-time required files. python-six library is only required by the openvswitch python library on target machine, not a build dependency. We override host PYTHONPATH by overriding it in MAKE_VARS. This way we can remove 0003-override-pythonpath-via-make-vars.patch This also fixes shebang wrongly pointing to python on host Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-02-28 13:22:20 +08:00
# foo/__init__.pyc will cause Python to ignore foo.py.
run_python = \
PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
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>
2020-03-23 15:04:40 +08:00
- PYTHONDONTWRITEBYTECODE=yes $(PYTHON3)
+ PYTHONDONTWRITEBYTECODE=yes $(PYTHON3_HOST)
openvswitch: python: rework host and target dependency Open vSwitch needs to run python on build machine to make build-time required files. python-six library is only required by the openvswitch python library on target machine, not a build dependency. We override host PYTHONPATH by overriding it in MAKE_VARS. This way we can remove 0003-override-pythonpath-via-make-vars.patch This also fixes shebang wrongly pointing to python on host Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-02-28 13:22:20 +08:00
ALL_LOCAL =
BUILT_SOURCES =
openvswitch: bump to 2.17.9 Refresh and backport patches so that - ./python path in the source code takes precedence over the same dir in hostpkg - OVN LTS version 22.03.5 which depends on Open vSwitch 3.0 can compile with Open vSwitch 2.17 Fixes: https://github.com/openwrt/packages/issues/22744 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2024-02-05 11:14:38 +08:00
@@ -148,7 +148,7 @@ ro_shell = printf '\043 Generated automa
SUFFIXES += .in
.in:
- $(AM_V_GEN)PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/soexpand.py -I$(srcdir) < $< | \
+ $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/soexpand.py -I$(srcdir) < $< | \
$(PYTHON3) $(srcdir)/build-aux/dpdkstrip.py $(DPDKSTRIP_FLAGS) | \
sed \
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@ -415,7 +415,7 @@ CLEANFILES += flake8-check
-include manpages.mk
manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/ovs_build_helpers/soutil.py
- @PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
+ @$(run_python) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
@if cmp -s $(@F).tmp $@; then \
touch $@; \
rm -f $(@F).tmp; \
openvswitch: python: rework host and target dependency Open vSwitch needs to run python on build machine to make build-time required files. python-six library is only required by the openvswitch python library on target machine, not a build dependency. We override host PYTHONPATH by overriding it in MAKE_VARS. This way we can remove 0003-override-pythonpath-via-make-vars.patch This also fixes shebang wrongly pointing to python on host Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-02-28 13:22:20 +08:00
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
openvswitch: bump to version 2.17.0 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2022-03-23 14:47:41 +08:00
@@ -400,6 +400,8 @@ else:
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>
2020-03-23 15:04:40 +08:00
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])
openvswitch: python: rework host and target dependency Open vSwitch needs to run python on build machine to make build-time required files. python-six library is only required by the openvswitch python library on target machine, not a build dependency. We override host PYTHONPATH by overriding it in MAKE_VARS. This way we can remove 0003-override-pythonpath-via-make-vars.patch This also fixes shebang wrongly pointing to python on host Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-02-28 13:22:20 +08:00
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>
2020-03-23 15:04:40 +08:00
dnl Checks for flake8.