[OE-core] [PATCH 2/2] python: consolidate common patches

Anuj Mittal anuj.mittal at intel.com
Fri Oct 5 01:59:57 UTC 2018


On 10/05/2018 03:54 AM, Alejandro Enedino Hernandez Samaniego wrote:
> Hey Anuj,
> 
> 
> On 10/03/2018 10:09 PM, Anuj Mittal wrote:
>> Move inclusion of common patches to .inc to simplify things a bit.
>>
>> Signed-off-by: Anuj Mittal <anuj.mittal 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 7c491fa3e0..ee2ec1082a 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 66923678b1..38cc79cb41 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 \
> 
> The multilib.patch is actually a different file for the native and 
> target packages, I suggest we rename it and keep it on each recipe 
> separately.
> 

Thanks Alejandro for checking. You're right. Both patches look like they
are doing the exact same thing though and perhaps one of them should be
removed. But, this patch was supposed to be a trivial cleanup.

So, can this (2/2 only) be ignored please? I will take a look at it
later after the release.

Thanks,

Anuj



More information about the Openembedded-core mailing list