mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
72
package/python-setuptools/0001-add-executable.patch
Normal file
72
package/python-setuptools/0001-add-executable.patch
Normal file
@@ -0,0 +1,72 @@
|
||||
From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Mon, 7 Dec 2015 01:14:33 +0100
|
||||
Subject: [PATCH 1/1] 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 <gustavo@zacarias.com.ar>
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
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 d2bca2e..b60ef19 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"),
|
||||
@@ -31,6 +32,7 @@ class install(orig.install):
|
||||
|
||||
def initialize_options(self):
|
||||
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 be66cb2..07afaf8 100755
|
||||
--- a/setuptools/command/install_scripts.py
|
||||
+++ b/setuptools/command/install_scripts.py
|
||||
@@ -11,6 +11,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
|
||||
@@ -31,6 +38,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
|
||||
bw_cmd = self.get_finalized_command("bdist_wininst")
|
||||
is_wininst = getattr(bw_cmd, '_is_running', False)
|
||||
writer = ei.ScriptWriter
|
||||
--
|
||||
2.6.3
|
||||
|
||||
11
package/python-setuptools/Config.in
Normal file
11
package/python-setuptools/Config.in
Normal file
@@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_PYTHON_SETUPTOOLS
|
||||
bool "python-setuptools"
|
||||
select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
|
||||
select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
|
||||
select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
|
||||
select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
|
||||
help
|
||||
Download, build, install, upgrade, and uninstall Python
|
||||
packages.
|
||||
|
||||
http://pypi.python.org/pypi/setuptools
|
||||
4
package/python-setuptools/python-setuptools.hash
Normal file
4
package/python-setuptools/python-setuptools.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# From https://pypi.org/pypi/setuptools/json
|
||||
md5 6404ca798bb9a9073aff3b91b2df35c8 setuptools-41.0.1.zip
|
||||
sha256 a222d126f5471598053c9a77f4b5d4f26eaa1f150ad6e01dcf1a42e185d05613 setuptools-41.0.1.zip
|
||||
sha256 c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a LICENSE
|
||||
30
package/python-setuptools/python-setuptools.mk
Normal file
30
package/python-setuptools/python-setuptools.mk
Normal file
@@ -0,0 +1,30 @@
|
||||
################################################################################
|
||||
#
|
||||
# python-setuptools
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# Please keep in sync with
|
||||
# package/python3-setuptools/python3-setuptools.mk
|
||||
PYTHON_SETUPTOOLS_VERSION = 41.0.1
|
||||
PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip
|
||||
PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/1d/64/a18a487b4391a05b9c7f938b94a16d80305bf0369c6b0b9509e86165e1d3
|
||||
PYTHON_SETUPTOOLS_LICENSE = MIT
|
||||
PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE
|
||||
PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
|
||||
HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2
|
||||
|
||||
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
|
||||
|
||||
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)
|
||||
endef
|
||||
|
||||
$(eval $(python-package))
|
||||
$(eval $(host-python-package))
|
||||
Reference in New Issue
Block a user