From 2648f2e02c864c3615bf53db4a79a0d9f4d00202 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 8 Nov 2021 12:06:09 +0200 Subject: [PATCH 1/3] openvswitch: remove python-six dependency Python six was required to build the OVS Python libs during the time when they were supporting both Python 2 & 3. Python 3 is a minimum requirement for OVS Python's libs since commits: https://github.com/openvswitch/ovs/commit/1ca0323e7c29dc7ef5a615c265df0460208f92de https://github.com/openvswitch/ovs/commit/bd9052455092630e03485538a29f9f8d147c41ca and Six is no longer required since commit https://github.com/openvswitch/ovs/commit/0c4d144a989a444d038d58272d8571e97e00e86f The end-goal here is to get rid of the Python Six host-build. OVS is the only user. Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 1fdc11c070..d9872ba984 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -17,7 +17,7 @@ include ./openvswitch.mk # PKG_NAME:=openvswitch PKG_VERSION:=$(ovs_version) -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.openvswitch.org/releases/ PKG_HASH:=7d5797f2bf2449c6a266149e88f72123540f7fe7f31ad52902057ae8d8f88c38 @@ -27,7 +27,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:openvswitch:openvswitch PKG_BUILD_DIR:=$(ovs_builddir) -PKG_BUILD_DEPENDS+=python3/host python-six/host +PKG_BUILD_DEPENDS+=python3/host PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf @@ -234,7 +234,7 @@ $(eval $(call OvsPackageTemplate,openvswitch)) ovs_python3_title:=Open vSwitch (Python3 library) ovs_python3_hidden:= -ovs_python3_depends:=+PACKAGE_openvswitch-python3:python3 +PACKAGE_openvswitch-python3:python3-six +ovs_python3_depends:=+PACKAGE_openvswitch-python3:python3 define ovs_python3_install $$(INSTALL_DIR) $$(1)$$(PYTHON3_PKG_DIR) $$(CP) $$(PKG_INSTALL_DIR)/usr/share/openvswitch/python/ovs $$(1)$$(PYTHON3_PKG_DIR) From 22ad3368f36ee98e60e86dc15c0652c1324c9d0d Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 8 Nov 2021 12:11:43 +0200 Subject: [PATCH 2/3] ovn: remove python-six dep OVN doesn't require Python Six, since about commit https://github.com/ovn-org/ovn/commit/338a6ddb5ea1c89b48c484b0448a216a82225adc Maybe even earlier than that. There are some left-over installations of six in their CI, but no usage in any Python source code. Refreshed patches. Signed-off-by: Alexandru Ardelean --- net/ovn/Makefile | 4 ++-- net/ovn/patches/0002-build-skip-tests-and-docs.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ovn/Makefile b/net/ovn/Makefile index 162150045a..8b165c43b4 100644 --- a/net/ovn/Makefile +++ b/net/ovn/Makefile @@ -10,7 +10,7 @@ include ../openvswitch/openvswitch.mk PKG_NAME:=ovn PKG_VERSION:=20.12.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ovn-org/ovn.git @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:openvswitch:openvswitch PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DEPENDS+=python3/host python-six/host +PKG_BUILD_DEPENDS+=python3/host PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf diff --git a/net/ovn/patches/0002-build-skip-tests-and-docs.patch b/net/ovn/patches/0002-build-skip-tests-and-docs.patch index 12ef25de0b..8fb7ffef72 100644 --- a/net/ovn/patches/0002-build-skip-tests-and-docs.patch +++ b/net/ovn/patches/0002-build-skip-tests-and-docs.patch @@ -10,7 +10,7 @@ Signed-off-by: Yousong Zhou --- a/Makefile.am +++ b/Makefile.am -@@ -483,11 +483,9 @@ dist-docs: +@@ -479,11 +479,9 @@ dist-docs: include automake.mk From b84b71c149e2bc9c8cb59483b117bcdfd8f8da4b Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 8 Nov 2021 12:09:30 +0200 Subject: [PATCH 3/3] python-six: remove host-build There are no more users left in this tree. So, remove it. Signed-off-by: Alexandru Ardelean --- lang/python/python-six/Makefile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lang/python/python-six/Makefile b/lang/python/python-six/Makefile index bb5356d315..20ec34aead 100644 --- a/lang/python/python-six/Makefile +++ b/lang/python/python-six/Makefile @@ -18,10 +18,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jeffery To , Alexandru Ardelean -HOST_BUILD_DEPENDS:=python3/host - include ../pypi.mk -include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk @@ -41,14 +38,6 @@ writing Python code that is compatible on both Python versions. See the documentation for more information on what is provided. endef -define Host/Compile - $(call HostPython3/ModSetup,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)") -endef - -Host/Install:= - -$(eval $(call HostBuild)) - $(eval $(call Py3Package,python3-six)) $(eval $(call BuildPackage,python3-six)) $(eval $(call BuildPackage,python3-six-src))