From: Alexandru Ardelean <redacted>
Date: Mon, 8 Nov 2021 10:11:43 +0000 (+0200)
Subject: ovn: remove python-six dep
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=22ad3368f36ee98e60e86dc15c0652c1324c9d0d;p=openwrt-packages.git

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 <redacted>
---

diff --git a/net/ovn/Makefile b/net/ovn/Makefile
index 162150045..8b165c43b 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 12ef25de0..8fb7ffef7 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 <yszhou4tech@gmail.com>
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -483,11 +483,9 @@ dist-docs:
+@@ -479,11 +479,9 @@ dist-docs:
  
  
  include automake.mk