diff --git a/package/python-setuptools/0001-add-executable.patch b/package/python-setuptools/44.0.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/0001-add-executable.patch rename to package/python-setuptools/44.0.0/0001-add-executable.patch diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/44.0.0/python-setuptools.hash similarity index 100% rename from package/python-setuptools/python-setuptools.hash rename to package/python-setuptools/44.0.0/python-setuptools.hash diff --git a/package/python-setuptools/59.8.0/0001-add-executable.patch b/package/python-setuptools/59.8.0/0001-add-executable.patch new file mode 100644 index 0000000000..b688745ce4 --- /dev/null +++ b/package/python-setuptools/59.8.0/0001-add-executable.patch @@ -0,0 +1,72 @@ +From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Mon, 7 Dec 2015 01:14:33 +0100 +Subject: [PATCH] add executable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add a new --executable option to distribute so that we can +force the shebang line in installed python scripts. + +[Thomas: refresh for setuptools 5.8.] +[Jörg: refresh for setuptools 18.7.1] + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Thomas Petazzoni +Signed-off-by: Jörg Krause +--- + setuptools/command/install.py | 2 ++ + setuptools/command/install_scripts.py | 9 +++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/setuptools/command/install.py b/setuptools/command/install.py +index 72b9a3e..6781d2b 100644 +--- a/setuptools/command/install.py ++++ b/setuptools/command/install.py +@@ -16,6 +16,7 @@ class install(orig.install): + """Use easy_install to install the package, w/dependencies""" + + user_options = orig.install.user_options + [ ++ ('executable=', 'e', "specify final destination interpreter path"), + ('old-and-unmanageable', None, "Try not to use this!"), + ('single-version-externally-managed', None, + "used by system package builders to create 'flat' eggs"), +@@ -38,6 +39,7 @@ class install(orig.install): + ) + + orig.install.initialize_options(self) ++ self.executable = None + self.old_and_unmanageable = None + self.single_version_externally_managed = None + +diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py +index 9cd8eb0..7786150 100644 +--- a/setuptools/command/install_scripts.py ++++ b/setuptools/command/install_scripts.py +@@ -13,6 +13,13 @@ class install_scripts(orig.install_scripts): + def initialize_options(self): + orig.install_scripts.initialize_options(self) + self.no_ep = False ++ self.executable = None ++ ++ def finalize_options(self): ++ orig.install_scripts.finalize_options(self) ++ self.set_undefined_options('install', ++ ('executable','executable') ++ ) + + def run(self): + import setuptools.command.easy_install as ei +@@ -33,6 +40,8 @@ class install_scripts(orig.install_scripts): + ) + bs_cmd = self.get_finalized_command('build_scripts') + exec_param = getattr(bs_cmd, 'executable', None) ++ if self.executable is not None: ++ exec_param = self.executable + try: + bw_cmd = self.get_finalized_command("bdist_wininst") + is_wininst = getattr(bw_cmd, '_is_running', False) +-- +2.30.2 + diff --git a/package/python-setuptools/59.8.0/python-setuptools.hash b/package/python-setuptools/59.8.0/python-setuptools.hash new file mode 100644 index 0000000000..285919639d --- /dev/null +++ b/package/python-setuptools/59.8.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 675f2089d970bf0bbfc3f49c80e4c7c3 setuptools-59.8.0.tar.gz +sha256 09980778aa734c3037a47997f28d6db5ab18bdf2af0e49f719bfc53967fd2e82 setuptools-59.8.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 08a180ce0c..30f0f255ed 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,11 +4,26 @@ # ################################################################################ +# For the target variant, we adapt the version depending on whether +# Python 3.x or 2.x is selected for the target. +ifeq ($(BR2_PACKAGE_PYTHON3),y) # Please keep in sync with # package/python3-setuptools/python3-setuptools.mk +PYTHON_SETUPTOOLS_VERSION = 59.8.0 +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 +else # Python PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +endif + +# The host variant is only for Python 2.x, so we need to use 44.0.0. +HOST_PYTHON_SETUPTOOLS_VERSION = 44.0.0 +HOST_PYTHON_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION).zip +HOST_PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 + PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python @@ -16,16 +31,18 @@ PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 +ifeq ($(BR2_PACKAGE_PYTHON),y) define PYTHON_SETUPTOOLS_EXTRACT_CMDS $(UNZIP) -d $(@D) $(PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) endef +endif define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(PYTHON_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) + $(UNZIP) -d $(@D) $(HOST_PYTHON_SETUPTOOLS_DL_DIR)/$(HOST_PYTHON_SETUPTOOLS_SOURCE) + mv $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION)/* $(@D) + $(RM) -r $(@D)/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION) endef $(eval $(python-package)) diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 5bab3d96a1..6fc7595a8d 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/0001-add-executable.patch \ No newline at end of file +../python-setuptools/59.8.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index a3af7f0fb1..91d8bc0887 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/python-setuptools.hash \ No newline at end of file +../python-setuptools/59.8.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 34d5993120..f4dae2d15d 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,9 +6,9 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 44.0.0 -PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +PYTHON3_SETUPTOOLS_VERSION = 59.8.0 +PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/75/2bc7bef4d668f9caa9c6ed3f3187989922765403198243040d08d2a52725 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python @@ -17,10 +17,4 @@ PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 -define HOST_PYTHON3_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON3_SETUPTOOLS_DL_DIR)/$(PYTHON3_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION) -endef - $(eval $(host-python-package))