diff mbox

[RFC] package.bbclass: fix strip and split logic

Message ID 1390297632-9966-1-git-send-email-koen.kooi@linaro.org
State Accepted
Commit 8ea3cc2c45d4e34bb68bd3e0bc359204c772133c
Headers show

Commit Message

Koen Kooi Jan. 21, 2014, 9:47 a.m. UTC
Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split.

Original behaviour:

INHIBIT_PACKAGE_STRIP: no strip, no debug split
INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split

Behaviour after this patch:

INHIBIT_PACKAGE_STRIP: no strip, no debug split
INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
 meta/classes/package.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Koen Kooi Jan. 21, 2014, 2:03 p.m. UTC | #1
On 01/21/2014 02:57 PM, Richard Purdie wrote:
> On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote:
>> Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split.
>>
>> Original behaviour:
>>
>> INHIBIT_PACKAGE_STRIP: no strip, no debug split
>> INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split
>>
>> Behaviour after this patch:
>>
>> INHIBIT_PACKAGE_STRIP: no strip, no debug split
>> INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split
>>
>> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
>> ---
>>   meta/classes/package.bbclass | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> FWIW this resulted in a failure on minnow:
>
> http://autobuilder.yoctoproject.org/main/builders/minnow/builds/15/steps/BuildImages/logs/stdio
>
> So we may have some fixing up to do before this change can be merged...

I have that QA issue as warning not as error. I guess that's why my 
builds kept working :)

Aside from that, what are your thoughts on this patch?

regards,

Koen
Koen Kooi Jan. 23, 2014, 9:34 a.m. UTC | #2
On 01/21/2014 04:09 PM, Richard Purdie wrote:
> On Tue, 2014-01-21 at 15:03 +0100, Koen Kooi wrote:
>> On 01/21/2014 02:57 PM, Richard Purdie wrote:
>>> On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote:
>>>> Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split.
>>>>
>>>> Original behaviour:
>>>>
>>>> INHIBIT_PACKAGE_STRIP: no strip, no debug split
>>>> INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split
>>>>
>>>> Behaviour after this patch:
>>>>
>>>> INHIBIT_PACKAGE_STRIP: no strip, no debug split
>>>> INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split
>>>>
>>>> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
>>>> ---
>>>>    meta/classes/package.bbclass | 3 +--
>>>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> FWIW this resulted in a failure on minnow:
>>>
>>> http://autobuilder.yoctoproject.org/main/builders/minnow/builds/15/steps/BuildImages/logs/stdio
>>>
>>> So we may have some fixing up to do before this change can be merged...
>>
>> I have that QA issue as warning not as error. I guess that's why my
>> builds kept working :)
>>
>> Aside from that, what are your thoughts on this patch?
>
> I'm ok with it in principle but I'd like to see known build issues fixed
> before it goes in since red autobuilders cause me enough grief
> already ;-).

I've changed all occurrences of INHIBIT_PACKAGE_DEBUG_SPLIT to have 
INHIBIT_PACKAGE_STRIP as well in all the layers angstrom has configured. 
I've sent patches to:

meta-intel
meta-initramfs
meta-oe
meta-fsl-arm
meta-android
meta-aurora
meta-linaro-toolchain

Which brings me to my next point:

If you list a mailinglist in your README where you want to have patches 
sent, don't make it automatically reject them. I'm looking at you, 
shr-devel!
Koen Kooi Feb. 4, 2014, 8:58 a.m. UTC | #3
On 01/21/2014 04:09 PM, Richard Purdie wrote:
> On Tue, 2014-01-21 at 15:03 +0100, Koen Kooi wrote:
>> On 01/21/2014 02:57 PM, Richard Purdie wrote:
>>> On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote:
>>>> Marks original commit message and variable documentation state that stripping and splitting are independent of eachother, but package.bbclass ANDs the two INHIBIT flags to see which files can be stripped and/or split.
>>>>
>>>> Original behaviour:
>>>>
>>>> INHIBIT_PACKAGE_STRIP: no strip, no debug split
>>>> INHIBIT_PACAKGE_DEBUG_SPLIT: no strip, no debug split
>>>>
>>>> Behaviour after this patch:
>>>>
>>>> INHIBIT_PACKAGE_STRIP: no strip, no debug split
>>>> INHIBIT_PACKAGE_DEBUG_SPLIT: strip, no split
>>>>
>>>> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
>>>> ---
>>>>    meta/classes/package.bbclass | 3 +--
>>>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> FWIW this resulted in a failure on minnow:
>>>
>>> http://autobuilder.yoctoproject.org/main/builders/minnow/builds/15/steps/BuildImages/logs/stdio
>>>
>>> So we may have some fixing up to do before this change can be merged...
>>
>> I have that QA issue as warning not as error. I guess that's why my
>> builds kept working :)
>>
>> Aside from that, what are your thoughts on this patch?
>
> I'm ok with it in principle but I'd like to see known build issues fixed
> before it goes in since red autobuilders cause me enough grief
> already ;-).

What's the status on this? I know a fix went into meta-intel (albeit it 
in a legally questionable way, but that's their problem) and the other 
affected layers have received patches for it.
Koen Kooi Feb. 4, 2014, 11:01 a.m. UTC | #4
On 02/04/2014 11:10 AM, Paul Eggleton wrote:
> On Tuesday 04 February 2014 09:58:47 Koen Kooi wrote:
>> What's the status on this? I know a fix went into meta-intel (albeit it
>> in a legally questionable way, but that's their problem) and the other
>> affected layers have received patches for it.
>
> Legally questionable in what way? If you refer to your name being removed from
> the patch, that was rectified before the patch was merged.

Good, the last I heard was that Tom merged the patches where authorship 
was removed due to "git workflow issues". I just checked meta-intel git 
and it seems to be OK now.

I still don't get how someone can (accidentally or not) add 
--reset-author their git patch workflow, but that's a different discussion.
Koen Kooi Feb. 4, 2014, 11:27 a.m. UTC | #5
On 02/04/2014 12:20 PM, Otavio Salvador wrote:
> Hello Richard,
>
> On Tue, Feb 4, 2014 at 7:32 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> On Tue, 2014-02-04 at 09:58 +0100, Koen Kooi wrote:
>>> On 01/21/2014 04:09 PM, Richard Purdie wrote:
>>>> On Tue, 2014-01-21 at 15:03 +0100, Koen Kooi wrote:
>>>>> On 01/21/2014 02:57 PM, Richard Purdie wrote:
>>>>>> On Tue, 2014-01-21 at 10:47 +0100, Koen Kooi wrote:
>>>> I'm ok with it in principle but I'd like to see known build issues fixed
>>>> before it goes in since red autobuilders cause me enough grief
>>>> already ;-).
>>>
>>> What's the status on this? I know a fix went into meta-intel (albeit it
>>> in a legally questionable way, but that's their problem) and the other
>>> affected layers have received patches for it.
>>
>> The last test build I ran:
>>
>> http://autobuilder.yoctoproject.org/main/builders/nightly-fsl-arm/builds/10/steps/BuildImages_1/logs/stdio
>>
>> still shows an error in the fsl-arm layer which I suspect is from this.
>> I was hoping that could get fixed before it merges, its very much still
>> in the queue though.
>>
>> I won't wait forever, equally, maintaining the green builds is proving
>> to consume a lot of my time and if I can avoid adding more failures, I'd
>> prefer to do so.
>
> I asked two fixes for Koen in the patch and I am awaiting this to
> apply his patches.

And I already said I'm not planning to jump through more hoops just to 
get this patch into OE-core.
diff mbox

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 768047c..fa0b7eb 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -781,8 +781,7 @@  python split_and_strip_files () {
     kernmods = []
     libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir", True))
     baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir", True))
-    if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT', True) != '1') and \
-            (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
+    if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
         for root, dirs, files in cpath.walk(dvar):
             for f in files:
                 file = os.path.join(root, f)