[oe-commits] [openembedded-core] 01/02: python: consolidate common patches

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ec8a13c622067684b0237b7d9f7787c6b5fce464
Author: Anuj Mittal <anuj.mittal at intel.com>
AuthorDate: Thu Oct 4 13:09:17 2018 +0800

    python: consolidate common patches
    
    Move inclusion of common patches to .inc to simplify things a bit.
    
    Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/python/python-native_2.7.15.bb | 3 ---
 meta/recipes-devtools/python/python.inc              | 3 +++
 meta/recipes-devtools/python/python_2.7.15.bb        | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/python/python-native_2.7.15.bb b/meta/recipes-devtools/python/python-native_2.7.15.bb
index 7c491fa..ee2ec10 100644
--- a/meta/recipes-devtools/python/python-native_2.7.15.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.15.bb
@@ -11,10 +11,7 @@ SRC_URI += "\
             file://debug.patch \
             file://unixccompiler.patch \
             file://nohostlibs.patch \
-            file://multilib.patch \
-            file://add-md5module-support.patch \
             file://builddir.patch \
-            file://parallel-makeinst-create-bindir.patch \
             file://revert_use_of_sysconfigdata.patch \
            "
 
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 6692367..38cc79c 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -13,6 +13,9 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch \
            file://0004-bpo-34836-fix-test_default_ecdh_curve-needs-no-tlsv1.patch \
            file://0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch \
+           file://multilib.patch \
+           file://add-md5module-support.patch \
+           file://parallel-makeinst-create-bindir.patch \
            "
 
 SRC_URI[md5sum] = "a80ae3cc478460b922242f43a1b4094d"
diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb
index 472c1da..8bc0f27 100644
--- a/meta/recipes-devtools/python/python_2.7.15.bb
+++ b/meta/recipes-devtools/python/python_2.7.15.bb
@@ -12,10 +12,8 @@ SRC_URI += "\
   file://03-fix-tkinter-detection.patch \
   file://06-avoid_usr_lib_termcap_path_in_linking.patch \
   ${DISTRO_SRC_URI} \
-  file://multilib.patch \
   file://cgi_py.patch \
   file://setup_py_skip_cross_import_check.patch \
-  file://add-md5module-support.patch \
   file://host_include_contamination.patch \
   file://fix_for_using_different_libdir.patch \
   file://setuptweaks.patch \
@@ -26,7 +24,6 @@ SRC_URI += "\
   file://python-2.7.3-remove-bsdb-rpath.patch \
   file://fix-makefile-for-ptest.patch \
   file://run-ptest \
-  file://parallel-makeinst-create-bindir.patch \
   file://use_sysroot_ncurses_instead_of_host.patch \
   file://add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
   file://pass-missing-libraries-to-Extension-for-mul.patch \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.