All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][master][krogoth] archiver: fix gcc-source handling
@ 2016-10-10 18:32 Saul Wold
  2016-10-17 14:25 ` Saul Wold
  2016-10-27 20:32 ` Wold, Saul
  0 siblings, 2 replies; 5+ messages in thread
From: Saul Wold @ 2016-10-10 18:32 UTC (permalink / raw)
  To: openembedded-core, richard.purdie

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@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



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH][master][krogoth] archiver: fix gcc-source handling
  2016-10-10 18:32 [PATCH][master][krogoth] archiver: fix gcc-source handling Saul Wold
@ 2016-10-17 14:25 ` Saul Wold
  2016-10-17 23:22   ` akuster808
  2016-10-27 20:32 ` Wold, Saul
  1 sibling, 1 reply; 5+ messages in thread
From: Saul Wold @ 2016-10-17 14:25 UTC (permalink / raw)
  To: openembedded-core, richard.purdie

This has been merged to master ping for Krogoth

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@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
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH][master][krogoth] archiver: fix gcc-source handling
  2016-10-17 14:25 ` Saul Wold
@ 2016-10-17 23:22   ` akuster808
  0 siblings, 0 replies; 5+ messages in thread
From: akuster808 @ 2016-10-17 23:22 UTC (permalink / raw)
  To: Saul Wold, openembedded-core, richard.purdie



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@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
>>



^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH][master][krogoth] archiver: fix gcc-source handling
  2016-10-10 18:32 [PATCH][master][krogoth] archiver: fix gcc-source handling Saul Wold
  2016-10-17 14:25 ` Saul Wold
@ 2016-10-27 20:32 ` Wold, Saul
  2016-10-27 21:36   ` akuster808
  1 sibling, 1 reply; 5+ messages in thread
From: Wold, Saul @ 2016-10-27 20:32 UTC (permalink / raw)
  To: openembedded-core, richard.purdie, akuster

This has been merged to master ping for Krogoth

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@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
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH][master][krogoth] archiver: fix gcc-source handling
  2016-10-27 20:32 ` Wold, Saul
@ 2016-10-27 21:36   ` akuster808
  0 siblings, 0 replies; 5+ messages in thread
From: akuster808 @ 2016-10-27 21:36 UTC (permalink / raw)
  To: openembedded-core



On 10/27/2016 01:32 PM, Wold, Saul wrote:
> This has been merged to master ping for Krogoth
>
> Sau!

is in my staging work.
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=akuster/krogoth-next&id=d52071671f6b93a7653b8445bf9bf2b9a5c0e29a

I am working on getting a clean build out of the AB before doing a pull 
request. I suppose I should send a pre-pull request for review.

- armin
>
> 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@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
>>



^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-27 21:36 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-10 18:32 [PATCH][master][krogoth] archiver: fix gcc-source handling Saul Wold
2016-10-17 14:25 ` Saul Wold
2016-10-17 23:22   ` akuster808
2016-10-27 20:32 ` Wold, Saul
2016-10-27 21:36   ` akuster808

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.