[OE-core] [PATCH][master][krogoth] archiver: fix gcc-source handling

[akuster808]

On 10/17/2016 07:25 AM, Saul Wold wrote:
> This has been merged to master ping for Krogoth
Merged to my stagging.  Thanks for the reminder.

- armin
>
> Sau!
>
> On Mon, 2016-10-10 at 11:32 -0700, Saul Wold wrote:
>> The source archiver was not handling the gcc-source target correctly,
>> since it uses the
>> work-shared directory, we don't want to unpack and patch it twice,
>> just as the comments
>> say, but the code was not there to check for the gcc-source target.
>>
>> [YOCTO #10265]
>>
>> Signed-off-by: Saul Wold <sgw at linux.intel.com>
>> ---
>>
>>   meta/classes/archiver.bbclass | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/archiver.bbclass
>> b/meta/classes/archiver.bbclass
>> index 1d8e863..9239983 100644
>> --- a/meta/classes/archiver.bbclass
>> +++ b/meta/classes/archiver.bbclass
>> @@ -303,9 +303,10 @@ python do_unpack_and_patch() {
>>           return
>>       ar_outdir = d.getVar('ARCHIVER_OUTDIR', True)
>>       ar_workdir = d.getVar('ARCHIVER_WORKDIR', True)
>> +    pn = d.getVar('PN', True)
>>   
>>       # The kernel class functions require it to be on work-shared, so
>> we dont change WORKDIR
>> -    if not bb.data.inherits_class('kernel-yocto', d):
>> +    if not (bb.data.inherits_class('kernel-yocto', d) or
>> pn.startswith('gcc-source')):
>>           # Change the WORKDIR to make do_unpack do_patch run in
>> another dir.
>>           d.setVar('WORKDIR', ar_workdir)
>>   
>> @@ -323,7 +324,7 @@ python do_unpack_and_patch() {
>>           oe.path.copytree(src, src_orig)
>>   
>>       # Make sure gcc and kernel sources are patched only once
>> -    if not ((d.getVar('SRC_URI', True) == "" or
>> bb.data.inherits_class('kernel-yocto', d))):
>> +    if not (d.getVar('SRC_URI', True) == "" or
>> (bb.data.inherits_class('kernel-yocto', d) or pn.startswith('gcc-
>> source'))):
>>           bb.build.exec_func('do_patch', d)
>>   
>>       # Create the patches
>> -- 
>> 2.7.4
>>