mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

python: refresh patches

Browse Source 
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: 0b25fcee333e6207a8596d26adfa65fec85c26df)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-03-08 20:18:02 +02:00
committed by Richard Purdie
parent e5f5aa5604
commit fe9e4bbee7
7 changed files with 57 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
View File

@@ -13,10 +13,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
configure.ac | 2 +- configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: Python-2.7.11/configure.ac Index: Python-2.7.13/configure.ac
=================================================================== ===================================================================
--- Python-2.7.11.orig/configure.ac --- Python-2.7.13.orig/configure.ac
+++ Python-2.7.11/configure.ac +++ Python-2.7.13/configure.ac
@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then @@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi fi
@@ -24,5 +24,5 @@ Index: Python-2.7.11/configure.ac
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
fi fi
elif test "$cross_compiling" = maybe; then # Used to comment out stuff for rebuilding generated files
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) GENERATED_COMMENT='#'

30
meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
View File

@@ -7,13 +7,16 @@ Upstream-Status: Inappropriate [distribution]
Also simply disable the tk module since its not in DEPENDS. Also simply disable the tk module since its not in DEPENDS.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Index: Python-2.7.2/setup.py Index: Python-2.7.13/setup.py
=================================================================== ===================================================================
--- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 --- Python-2.7.13.orig/setup.py
+++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 +++ Python-2.7.13/setup.py
@@ -1634,8 +1634,10 @@ @@ -1783,10 +1783,12 @@ class PyBuildExt(build_ext):
self.extensions.extend(exts)
# Call the method for detecting whether _tkinter can be compiled # Call the method for detecting whether _tkinter can be compiled
self.detect_tkinter(inc_dirs, lib_dirs) - self.detect_tkinter(inc_dirs, lib_dirs)
+ # self.detect_tkinter(inc_dirs, lib_dirs)
- if '_tkinter' not in [e.name for e in self.extensions]: - if '_tkinter' not in [e.name for e in self.extensions]:
- missing.append('_tkinter') - missing.append('_tkinter')
@@ -22,18 +25,5 @@ Index: Python-2.7.2/setup.py
+ #if '_tkinter' not in [e.name for e in self.extensions]: + #if '_tkinter' not in [e.name for e in self.extensions]:
+ # missing.append('_tkinter') + # missing.append('_tkinter')
return missing ## # Uncomment these lines if you want to play with xxmodule.c
## ext = Extension('xx', ['xxmodule.c'])
diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py
index b4633b9..d7588c0 100644
--- Python-3.5.1.orig/setup.py
+++ Python-3.5.1/setup.py
@@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext):
self.extensions.extend(exts)
# Call the method for detecting whether _tkinter can be compiled
- self.detect_tkinter(inc_dirs, lib_dirs)
+ # self.detect_tkinter(inc_dirs, lib_dirs)
# tkinter module will not be avalaible as yocto
# doesn't have tk integrated (yet)

12
meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch
View File

@@ -5,12 +5,12 @@ Upstream-Status: Inappropriate [distribution]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Index: Python-2.7.2/setup.py Index: Python-2.7.13/setup.py
=================================================================== ===================================================================
--- Python-2.7.2.orig/setup.py 2012-04-05 22:29:18.049196608 +0300 --- Python-2.7.13.orig/setup.py
+++ Python-2.7.2/setup.py 2012-04-05 22:29:57.505195453 +0300 +++ Python-2.7.13/setup.py
@@ -1522,8 +1522,9 @@ @@ -1671,8 +1671,9 @@ class PyBuildExt(build_ext):
if platform == 'sunos5': if host_platform == 'sunos5':
# SunOS specific modules # SunOS specific modules
exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) ) exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
- else: - else:
@@ -19,5 +19,5 @@ Index: Python-2.7.2/setup.py
+ #else: + #else:
+ # missing.append('sunaudiodev') + # missing.append('sunaudiodev')
if platform == 'darwin': if host_platform == 'darwin':
# _scproxy # _scproxy

14
meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
View File

@@ -8,9 +8,11 @@ Upstream-Status: Inappropriate [OE specific]
Makefile.pre.in | 6 +++--- Makefile.pre.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/Makefile.pre.in Index: Python-3.5.3/Makefile.pre.in
+++ b/Makefile.pre.in ===================================================================
@@ -1306,8 +1306,8 @@ touch: --- Python-3.5.3.orig/Makefile.pre.in
+++ Python-3.5.3/Makefile.pre.in
@@ -1574,8 +1574,8 @@ touch:
# Sanitation targets -- clean leaves libraries, executables and tags # Sanitation targets -- clean leaves libraries, executables and tags
# files, which clobber removes as well # files, which clobber removes as well
pycremoval: pycremoval:
@@ -21,7 +23,7 @@ Upstream-Status: Inappropriate [OE specific]
rmtestturds: rmtestturds:
-rm -f *BAD *GOOD *SKIPPED -rm -f *BAD *GOOD *SKIPPED
@@ -1321,9 +1321,9 @@ docclean: @@ -1589,9 +1589,9 @@ docclean:
-rm -rf Doc/tools/sphinx Doc/tools/pygments Doc/tools/docutils -rm -rf Doc/tools/sphinx Doc/tools/pygments Doc/tools/docutils
clean: pycremoval clean: pycremoval
@@ -32,5 +34,5 @@ Upstream-Status: Inappropriate [OE specific]
+ find . ! -path './ipkg-install/*' -name '*.s[ol]' -exec rm -f {} ';' + find . ! -path './ipkg-install/*' -name '*.s[ol]' -exec rm -f {} ';'
+ find . ! -path './ipkg-install/*' -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' + find . ! -path './ipkg-install/*' -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
find build -name 'fficonfig.h' -exec rm -f {} ';' || true find build -name 'fficonfig.h' -exec rm -f {} ';' || true
find build -name 'fficonfig.py' -exec rm -f {} ';' || true find build -name '*.py' -exec rm -f {} ';' || true
-rm -f Lib/lib2to3/*Grammar*.pickle find build -name '*.py[co]' -exec rm -f {} ';' || true

30
meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
View File

@@ -7,13 +7,16 @@ Upstream-Status: Inappropriate [distribution]
Also simply disable the tk module since its not in DEPENDS. Also simply disable the tk module since its not in DEPENDS.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Index: Python-2.7.2/setup.py Index: Python-3.5.3/setup.py
=================================================================== ===================================================================
--- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 --- Python-3.5.3.orig/setup.py
+++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 +++ Python-3.5.3/setup.py
@@ -1634,8 +1634,10 @@ @@ -1558,10 +1558,12 @@ class PyBuildExt(build_ext):
self.extensions.extend(exts)
# Call the method for detecting whether _tkinter can be compiled # Call the method for detecting whether _tkinter can be compiled
self.detect_tkinter(inc_dirs, lib_dirs) - self.detect_tkinter(inc_dirs, lib_dirs)
+ # self.detect_tkinter(inc_dirs, lib_dirs)
- if '_tkinter' not in [e.name for e in self.extensions]: - if '_tkinter' not in [e.name for e in self.extensions]:
- missing.append('_tkinter') - missing.append('_tkinter')
@@ -22,18 +25,5 @@ Index: Python-2.7.2/setup.py
+ #if '_tkinter' not in [e.name for e in self.extensions]: + #if '_tkinter' not in [e.name for e in self.extensions]:
+ # missing.append('_tkinter') + # missing.append('_tkinter')
return missing ## # Uncomment these lines if you want to play with xxmodule.c
## ext = Extension('xx', ['xxmodule.c'])
diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py
index b4633b9..d7588c0 100644
--- Python-3.5.1.orig/setup.py
+++ Python-3.5.1/setup.py
@@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext):
self.extensions.extend(exts)
# Call the method for detecting whether _tkinter can be compiled
- self.detect_tkinter(inc_dirs, lib_dirs)
+ # self.detect_tkinter(inc_dirs, lib_dirs)
# tkinter module will not be avalaible as yocto
# doesn't have tk integrated (yet)

17
meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
View File

@@ -10,19 +10,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
configure.ac | 2 +- configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac Index: Python-3.5.3/configure.ac
index 989baf9..2890c96 100644 ===================================================================
--- a/configure.ac --- Python-3.5.3.orig/configure.ac
+++ b/configure.ac +++ Python-3.5.3/configure.ac
@@ -67,7 +67,7 @@ if test "$cross_compiling" = yes; then @@ -78,7 +78,7 @@ if test "$cross_compiling" = yes; then
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi fi
AC_MSG_RESULT($interp) AC_MSG_RESULT($interp)
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH) '$interp
fi fi
elif test "$cross_compiling" = maybe; then # Used to comment out stuff for rebuilding generated files
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) GENERATED_COMMENT='#'
--
2.0.1

25
meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
View File

@@ -17,12 +17,12 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Lib/sysconfig.py | 5 ++++- Lib/sysconfig.py | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py Index: Python-3.5.3/Lib/distutils/sysconfig.py
index a545ab9..74317d1 100644 ===================================================================
--- a/Lib/distutils/sysconfig.py --- Python-3.5.3.orig/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py +++ Python-3.5.3/Lib/distutils/sysconfig.py
@@ -554,7 +554,10 @@ def get_config_vars(*args): @@ -498,7 +498,10 @@ def get_config_vars(*args):
_config_vars['exec_prefix'] = EXEC_PREFIX _config_vars['SO'] = SO
# Always convert srcdir to an absolute path # Always convert srcdir to an absolute path
- srcdir = _config_vars.get('srcdir', project_base) - srcdir = _config_vars.get('srcdir', project_base)
@@ -33,11 +33,11 @@ index a545ab9..74317d1 100644
if os.name == 'posix': if os.name == 'posix':
if python_build: if python_build:
# If srcdir is a relative path (typically '.' or '..') # If srcdir is a relative path (typically '.' or '..')
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py Index: Python-3.5.3/Lib/sysconfig.py
index 7287f11..cc92998 100644 ===================================================================
--- a/Lib/sysconfig.py --- Python-3.5.3.orig/Lib/sysconfig.py
+++ b/Lib/sysconfig.py +++ Python-3.5.3/Lib/sysconfig.py
@@ -562,7 +562,10 @@ def get_config_vars(*args): @@ -544,7 +544,10 @@ def get_config_vars(*args):
_CONFIG_VARS['userbase'] = _getuserbase() _CONFIG_VARS['userbase'] = _getuserbase()
# Always convert srcdir to an absolute path # Always convert srcdir to an absolute path
@@ -49,6 +49,3 @@ index 7287f11..cc92998 100644
if os.name == 'posix': if os.name == 'posix':
if _PYTHON_BUILD: if _PYTHON_BUILD:
# If srcdir is a relative path (typically '.' or '..') # If srcdir is a relative path (typically '.' or '..')
--
1.7.9.5