From c8d4bb4759191563f41d4bd8a40a9921440d6938 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Mon, 6 Mar 2023 22:29:15 +0800
Subject: [PATCH] python-packages: Clean up build variables

* Rename PYTHON3_PKG_SETUP_VARS to PYTHON3_PKG_BUILD_VARS, and
  PYTHON3_PKG_SETUP_DIR to PYTHON3_PKG_BUILD_PATH

  The new variable names emphasize that these values apply to the new
  build process.

* Remove PYTHON3_PKG_SETUP_ARGS set to the empty string

  These were set to override the default arguments in the old build
  process and not applicable to the new build process.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit b1b008f42ff0a6da96b801e2eaf68be4e2f2b5bb)
---
 lang/python/python-automat/Makefile         | 4 ++--
 lang/python/python-cached-property/Makefile | 4 +---
 lang/python/python-crcmod/Makefile          | 4 +---
 lang/python/python-cryptodome/Makefile      | 5 ++---
 lang/python/python-cryptodomex/Makefile     | 5 ++---
 lang/python/python-curl/Makefile            | 4 +---
 lang/python/python-docker/Makefile          | 4 +---
 lang/python/python-dockerpty/Makefile       | 4 +---
 lang/python/python-docopt/Makefile          | 4 +---
 lang/python/python-docutils/Makefile        | 4 +---
 lang/python/python-intelhex/Makefile        | 4 +---
 lang/python/python-paramiko/Makefile        | 4 +---
 lang/python/python-parsley/Makefile         | 4 +---
 lang/python/python-pynacl/Makefile          | 4 ++--
 lang/python/python-stem/Makefile            | 2 --
 lang/python/python-yaml/Makefile            | 3 +--
 lang/python/python3-pyroute2/Makefile       | 4 +---
 utils/i2c-tools/Makefile                    | 5 ++---
 18 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/lang/python/python-automat/Makefile b/lang/python/python-automat/Makefile
index 248f7b7055..7802168aae 100644
--- a/lang/python/python-automat/Makefile
+++ b/lang/python/python-automat/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-automat
 PKG_VERSION:=20.2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=Automat
 PKG_HASH:=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
@@ -22,7 +22,7 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_VARS:= \
+PYTHON3_PKG_BUILD_VARS:= \
   PKG_VERSION="$(PKG_VERSION)"
 
 define Package/python3-automat
diff --git a/lang/python/python-cached-property/Makefile b/lang/python/python-cached-property/Makefile
index 63685ba9c3..a95d298aaa 100644
--- a/lang/python/python-cached-property/Makefile
+++ b/lang/python/python-cached-property/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cached-property
 PKG_VERSION:=1.5.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=cached-property
 PKG_HASH:=9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130
@@ -15,8 +15,6 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 define Package/python3-cached-property
   SECTION:=lang
   CATEGORY:=Languages
diff --git a/lang/python/python-crcmod/Makefile b/lang/python/python-crcmod/Makefile
index bd9d606b07..de59e612d1 100644
--- a/lang/python/python-crcmod/Makefile
+++ b/lang/python/python-crcmod/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-crcmod
 PKG_VERSION:=1.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=crcmod
 PKG_HASH:=dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e
@@ -13,8 +13,6 @@ PKG_HASH:=dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=David Bauer <mail@david-bauer.net>
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
diff --git a/lang/python/python-cryptodome/Makefile b/lang/python/python-cryptodome/Makefile
index 037ff861df..0f256628eb 100644
--- a/lang/python/python-cryptodome/Makefile
+++ b/lang/python/python-cryptodome/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptodome
 PKG_VERSION:=3.9.7
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PYPI_NAME:=pycryptodome
 PKG_HASH:=f1add21b6d179179b3c177c33d18a2186a09cc0d3af41ff5ed3f377360b869f2
@@ -20,8 +20,7 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-PYTHON3_PKG_SETUP_VARS:= \
+PYTHON3_PKG_BUILD_VARS:= \
   CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)"
 
 define Package/python3-cryptodome
diff --git a/lang/python/python-cryptodomex/Makefile b/lang/python/python-cryptodomex/Makefile
index 7cc4c530fb..9847db5832 100644
--- a/lang/python/python-cryptodomex/Makefile
+++ b/lang/python/python-cryptodomex/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptodomex
 PKG_VERSION:=3.10.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pycryptodomex
 PKG_HASH:=541cd3e3e252fb19a7b48f420b798b53483302b7fe4d9954c947605d0a263d62
@@ -19,8 +19,7 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-PYTHON3_PKG_SETUP_VARS:= \
+PYTHON3_PKG_BUILD_VARS:= \
   CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)"
 
 define Package/python3-cryptodomex
diff --git a/lang/python/python-curl/Makefile b/lang/python/python-curl/Makefile
index 7d8d69e829..b239efd3a0 100644
--- a/lang/python/python-curl/Makefile
+++ b/lang/python/python-curl/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pycurl
 PKG_VERSION:=7.45.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca
@@ -32,8 +32,6 @@ define Package/python3-curl/description
 PycURL is a Python interface to libcurl, the multiprotocol file transfer library.
 endef
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 ifdef CONFIG_LIBCURL_OPENSSL
   PYTHON3_PKG_BUILD_VARS:=PYCURL_SSL_LIBRARY=openssl
 endif
diff --git a/lang/python/python-docker/Makefile b/lang/python/python-docker/Makefile
index 22db2540b1..de278aac61 100644
--- a/lang/python/python-docker/Makefile
+++ b/lang/python/python-docker/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-docker
 PKG_VERSION:=6.0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=docker
 PKG_HASH:=896c4282e5c7af5c45e8b683b0b0c33932974fe6e50fc6906a0a83616ab3da97
@@ -17,8 +17,6 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 define Package/python3-docker
   SECTION:=lang
   CATEGORY:=Languages
diff --git a/lang/python/python-dockerpty/Makefile b/lang/python/python-dockerpty/Makefile
index 662e4c5529..8addc132ce 100644
--- a/lang/python/python-dockerpty/Makefile
+++ b/lang/python/python-dockerpty/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dockerpty
 PKG_VERSION:=0.4.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PYPI_NAME:=dockerpty
 PKG_HASH:=69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce
@@ -15,8 +15,6 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 define Package/python3-dockerpty
   SECTION:=lang
   CATEGORY:=Languages
diff --git a/lang/python/python-docopt/Makefile b/lang/python/python-docopt/Makefile
index cba2394584..fa6e982494 100644
--- a/lang/python/python-docopt/Makefile
+++ b/lang/python/python-docopt/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-docopt
 PKG_VERSION:=0.6.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=docopt
 PKG_HASH:=49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
@@ -15,8 +15,6 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 define Package/python3-docopt
   SECTION:=lang
   CATEGORY:=Languages
diff --git a/lang/python/python-docutils/Makefile b/lang/python/python-docutils/Makefile
index 23fcd4c829..50875051f4 100644
--- a/lang/python/python-docutils/Makefile
+++ b/lang/python/python-docutils/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docutils
 PKG_VERSION:=0.19
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6
@@ -29,8 +29,6 @@ such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText,
 an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.
 endef
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 $(eval $(call Py3Package,python3-docutils))
 $(eval $(call BuildPackage,python3-docutils))
 $(eval $(call BuildPackage,python3-docutils-src))
diff --git a/lang/python/python-intelhex/Makefile b/lang/python/python-intelhex/Makefile
index a7cfb785e4..8e0abd7391 100644
--- a/lang/python/python-intelhex/Makefile
+++ b/lang/python/python-intelhex/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-intelhex
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PYPI_NAME:=IntelHex
 PYPI_SOURCE_NAME:=intelhex
@@ -34,8 +34,6 @@ define Package/python3-intelhex/description
   scratch and manipulate data from Intel HEX file format.
 endef
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 $(eval $(call Py3Package,python3-intelhex))
 $(eval $(call BuildPackage,python3-intelhex))
 $(eval $(call BuildPackage,python3-intelhex-src))
diff --git a/lang/python/python-paramiko/Makefile b/lang/python/python-paramiko/Makefile
index 7cf7146047..03531ff9b2 100644
--- a/lang/python/python-paramiko/Makefile
+++ b/lang/python/python-paramiko/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-paramiko
 PKG_VERSION:=2.12.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=paramiko
 PKG_HASH:=376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49
@@ -15,8 +15,6 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 define Package/python3-paramiko
   SECTION:=lang
   CATEGORY:=Languages
diff --git a/lang/python/python-parsley/Makefile b/lang/python/python-parsley/Makefile
index 7eaf15e101..cff3d3ed64 100644
--- a/lang/python/python-parsley/Makefile
+++ b/lang/python/python-parsley/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-parsley
 PKG_VERSION:=1.3
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PYPI_NAME:=Parsley
 PKG_HASH:=9444278d47161d5f2be76a767809a3cbe6db4db822f46a4fd7481d4057208d41
@@ -22,8 +22,6 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 define Package/python3-parsley
   SECTION:=lang
   CATEGORY:=Languages
diff --git a/lang/python/python-pynacl/Makefile b/lang/python/python-pynacl/Makefile
index d3469cc43d..72d8debcb5 100644
--- a/lang/python/python-pynacl/Makefile
+++ b/lang/python/python-pynacl/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pynacl
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PYPI_NAME:=PyNaCl
 PKG_HASH:=8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba
@@ -13,7 +13,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_DEPENDS:=libffi/host python-cffi/host  # cffi>=1.4.1
 
-PYTHON3_PKG_SETUP_VARS:= SODIUM_INSTALL=system
+PYTHON3_PKG_BUILD_VARS:=SODIUM_INSTALL=system
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
diff --git a/lang/python/python-stem/Makefile b/lang/python/python-stem/Makefile
index 2c342fab1d..c09219e89c 100644
--- a/lang/python/python-stem/Makefile
+++ b/lang/python/python-stem/Makefile
@@ -11,8 +11,6 @@ PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
 PKG_LICENSE:=LGPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
diff --git a/lang/python/python-yaml/Makefile b/lang/python/python-yaml/Makefile
index ce421ffb2c..26326d660c 100644
--- a/lang/python/python-yaml/Makefile
+++ b/lang/python/python-yaml/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-yaml
 PKG_VERSION:=6.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PYPI_NAME:=PyYAML
 PKG_HASH:=68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2
@@ -39,7 +39,6 @@ define Package/python3-yaml/description
 endef
 
 PYTHON3_PKG_BUILD_VARS:=PYYAML_FORCE_LIBYAML=1
-PYTHON3_PKG_SETUP_ARGS:=
 
 $(eval $(call Py3Package,python3-yaml))
 $(eval $(call BuildPackage,python3-yaml))
diff --git a/lang/python/python3-pyroute2/Makefile b/lang/python/python3-pyroute2/Makefile
index 1f8cf55e65..e6edfd8470 100644
--- a/lang/python/python3-pyroute2/Makefile
+++ b/lang/python/python3-pyroute2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python3-pyroute2
 PKG_VERSION:=0.5.16
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=pyroute2
 PKG_HASH:=fe681a2d008cac815b9f287250d69a333fbfc2b2d89c37d58798104057149989
@@ -43,8 +43,6 @@ define Package/python3-pyroute2/description
   but now it supports many netlink protocols.
 endef
 
-PYTHON3_PKG_SETUP_ARGS:=
-
 $(eval $(call Py3Package,python3-pyroute2))
 $(eval $(call BuildPackage,python3-pyroute2))
 $(eval $(call BuildPackage,python3-pyroute2-src))
diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile
index f1a871dd99..cdae0d4eb2 100644
--- a/utils/i2c-tools/Makefile
+++ b/utils/i2c-tools/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=i2c-tools
 PKG_VERSION:=4.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/utils/i2c-tools
@@ -67,8 +67,7 @@ define Package/python3-smbus/description
  This package contain the Python3 bindings for Linux SMBus access through i2c-dev.
 endef
 
-PYTHON3_PKG_SETUP_ARGS:=
-PYTHON3_PKG_SETUP_DIR:=py-smbus
+PYTHON3_PKG_BUILD_PATH:=py-smbus
 PYTHON3_PKG_WHEEL_NAME:=smbus
 PYTHON3_PKG_WHEEL_VERSION:=1.1
 
-- 
2.30.2