From 989ef5d4149d2bf4295d8ee416ed0bcd71e84911 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 25 Apr 2019 10:45:17 +0000 Subject: [PATCH] openvswitch: switch to using python3 both on build and target machine Signed-off-by: Yousong Zhou --- net/openvswitch/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index b73446f32..81c67a3cf 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/kernel.mk # PKG_NAME:=openvswitch PKG_VERSION:=2.11.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.openvswitch.org/releases/ PKG_HASH:=f4b01d7376d7298bc6e7fa7a6067229ca7c7e299394e5ea9aff651d52edfdbee @@ -24,7 +24,7 @@ PKG_HASH:=f4b01d7376d7298bc6e7fa7a6067229ca7c7e299394e5ea9aff651d52edfdbee PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=python/host python-six/host +PKG_BUILD_DEPENDS+=python3/host python-six/host PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf @@ -33,7 +33,7 @@ PKG_INSTALL:=1 PKG_MAINTAINER:=Yousong Zhou include $(INCLUDE_DIR)/package.mk -include ../../lang/python/python-host.mk +include ../../lang/python/python3-host.mk include ../../lang/python/python-package.mk include ../../lang/python/python3-package.mk @@ -301,10 +301,10 @@ CONFIGURE_ARGS+= \ CONFIGURE_VARS += \ ovs_cv_flake8=no \ - ovs_cv_python3=no \ + ovs_cv_python=$(PYTHON3) \ + ovs_cv_python_host=$(HOST_PYTHON3_BIN) \ ovs_cv_sphinx=no \ - ovs_cv_python=$(PYTHON) \ - ovs_cv_python_host=$(HOST_PYTHON_BIN) \ + ovs_cv_python2=no \ KARCH=$(LINUX_KARCH) \ ovs_intree_kmod_configs:=CONFIG_PACKAGE_kmod-openvswitch-intree @@ -315,7 +315,7 @@ ifneq ($(ovs_intree_kmod_enabled),) endif TARGET_CFLAGS += -flto -std=gnu99 -MAKE_VARS += PYTHONPATH="$(HOST_PYTHONPATH)" +MAKE_VARS += PYTHONPATH="$(HOST_PYTHON3PATH)" $(foreach p,$(ovs_kmod_packages),\ $(eval $(call KernelPackage,$(p)))\