Revert "image.bbclass: don't execute compression commands multiple times"

Message ID 1464025857-23995-1-git-send-email-koen.kooi@linaro.org
State New
Headers show

Commit Message

Koen Kooi May 23, 2016, 5:50 p.m.
The commit breaks image_types_uboot.bbclass:

ERROR: Logfile of failure stored in: /build/linaro/build/build/tmp-glibc/work/genericarmv8-oe-linux/linaro-image-minimal-initramfs/1.0-r0/temp/log.do_image_cpio.16506
Log data follows:
| DEBUG: Executing python function set_image_size
| DEBUG: Python function set_image_size finished
| DEBUG: Executing shell function do_image_cpio
| 31373 blocks
| Image Name:   linaro-image-minimal-initramfs-g
| Created:      Mon May 23 19:38:56 2016
| Image Type:   ARM Linux RAMDisk Image (gzip compressed)
| Data Size:    7326620 Bytes = 7154.90 kB = 6.99 MB
| Load Address: 00000000
| Entry Point:  00000000
| mkimage: Can't open /build/linaro/build/build/tmp-glibc/deploy/images/genericarmv8/linaro-image-minimal-initramfs-genericarmv8-20160523173835.rootfs.cpio.gz: No such file or directory

This reverts commit 94f61c2682e5cfd819ac84535650c3e0a654415a.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>

---
 meta/classes/image.bbclass | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

-- 
2.4.3

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Koen Kooi June 6, 2016, 6:16 a.m. | #1
On 4 June 2016 at 15:09, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sat, 2016-06-04 at 10:41 +0200, Koen Kooi wrote:

>> ping 2

>

> It would be helpful if you'd cc'd the person who's patch you were

> suggesting we revert. I added Sasha to cc.


Sorry about that, I had expected 'git revert' to automatically add the
original sign-off somewhere.

> I've seen multiple different conflicting patches regarding the image

> types code and I've not had a chance to try and figure out what the

> real set of problems are


Disclaimer: it's all incomprehensible python to me.

The problem I'm running into is that I want a something.gz inside
something-else.gz, the patch that I reverted seems to say "Hey, gz is
mentioned twice, let's optimize that out". Patricks patches seem to
solve the same thing but not break things.

> and which of the various proposed patches make

> things worse or better.

>

> Until someone can explain clearly to me what the problems are and how

> we move forward


I'm not sure what problems the compression patches are trying to fix,
just that this single patches breaks an oe-core class and reverts
cleanly.

>, or I find time to dig into it myself, we're a bit

> stuck :/. I just mention this since I expect you're getting frustrated

> hearing nothing. This has been flagged in my inbox, I'm just lacking

> the time to do everything I'd like :(


Sure, thanks for the heads-up, a response makes the bean counters at
work happy :)

regards,

Koen

>

> Cheers,

>

> Richard

>

>> > Op 30 mei 2016, om 13:28 heeft Koen Kooi <

>> > koen@dominion.thruhere.net> het volgende geschreven:

>> >

>> > ping

>> >

>> > > Op 23 mei 2016, om 19:50 heeft Koen Kooi <koen.kooi@linaro.org>

>> > > het volgende geschreven:

>> > >

>> > > The commit breaks image_types_uboot.bbclass:

>> > >

>> > > ERROR: Logfile of failure stored in:

>> > > /build/linaro/build/build/tmp-glibc/work/genericarmv8-oe

>> > > -linux/linaro-image-minimal-initramfs/1.0

>> > > -r0/temp/log.do_image_cpio.16506

>> > > Log data follows:

>> > > > DEBUG: Executing python function set_image_size

>> > > > DEBUG: Python function set_image_size finished

>> > > > DEBUG: Executing shell function do_image_cpio

>> > > > 31373 blocks

>> > > > Image Name:   linaro-image-minimal-initramfs-g

>> > > > Created:      Mon May 23 19:38:56 2016

>> > > > Image Type:   ARM Linux RAMDisk Image (gzip compressed)

>> > > > Data Size:    7326620 Bytes = 7154.90 kB = 6.99 MB

>> > > > Load Address: 00000000

>> > > > Entry Point:  00000000

>> > > > mkimage: Can't open /build/linaro/build/build/tmp

>> > > > -glibc/deploy/images/genericarmv8/linaro-image-minimal

>> > > > -initramfs-genericarmv8-20160523173835.rootfs.cpio.gz: No such

>> > > > file or directory

>> > >

>> > > This reverts commit 94f61c2682e5cfd819ac84535650c3e0a654415a.

>> > >

>> > > Signed-off-by: Koen Kooi <koen.kooi@linaro.org>

>> > > ---

>> > > meta/classes/image.bbclass | 8 ++------

>> > > 1 file changed, 2 insertions(+), 6 deletions(-)

>> > >

>> > > diff --git a/meta/classes/image.bbclass

>> > > b/meta/classes/image.bbclass

>> > > index 9f4c83f..df3bd3a 100644

>> > > --- a/meta/classes/image.bbclass

>> > > +++ b/meta/classes/image.bbclass

>> > > @@ -410,13 +410,9 @@ python () {

>> > >                    # Create input image first.

>> > >                    gen_conversion_cmds(type)

>> > >                    localdata.setVar('type', type)

>> > > -                    cmd = "\t" +

>> > > localdata.getVar("COMPRESS_CMD_" + ctype, True)

>> > > -                    if cmd not in cmds:

>> > > -                        cmds.append(cmd)

>> > > +                    cmds.append("\t" +

>> > > localdata.getVar("COMPRESS_CMD_" + ctype, True))

>> > >                    vardeps.add('COMPRESS_CMD_' + ctype)

>> > > -                    subimage = type + "." + ctype

>> > > -                    if subimage not in subimages:

>> > > -                        subimages.append(subimage)

>> > > +                    subimages.append(type + "." + ctype)

>> > >                    if type not in alltypes:

>> > >

>> > >  rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SU

>> > > FFIX}.${type}"))

>> > >

>> > > --

>> > > 2.4.3

>> > >

>> > > --

>> > > _______________________________________________

>> > > Openembedded-core mailing list

>> > > Openembedded-core@lists.openembedded.org

>> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core

>> > >

>> >

>>




-- 
Koen Kooi

Builds and Baselines | Release Manager
Linaro.org | Open source software for ARM SoCs
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Koen Kooi June 19, 2016, 7:46 a.m. | #2
> Op 18 jun. 2016, om 20:21 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:
> 
> On Sat, 2016-06-18 at 15:08 +0200, Koen Kooi wrote:
>>> Op 4 jun. 2016, om 15:09 heeft Richard Purdie <
>>> richard.purdie@linuxfoundation.org> het volgende geschreven:
>>> 
>>> On Sat, 2016-06-04 at 10:41 +0200, Koen Kooi wrote:
>>>> ping 2
>>> 
>>> It would be helpful if you'd cc'd the person who's patch you were
>>> suggesting we revert. I added Sasha to cc.
>> 
>> Since the original committer has shown zero interest in responding
>> here or fixing the problem in the past month, can you please commit
>> this? This fixes a clear regression, which alone should have been
>> reason enough to commit this.
> 
> Did http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=7028192246552f
> d9e4aa3674da9c30670fd4ec86 fix this?

Don’t know since I use OE, not poky.

—
Koen Kooi
Builds and Baselines | Release Manager
Linaro.org | Open source software for ARM SoCs
Koen Kooi June 19, 2016, 5:27 p.m. | #3
On 19 June 2016 at 09:50, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sun, 2016-06-19 at 09:46 +0200, Koen Kooi wrote:
>>
>>
>> > Op 18 jun. 2016, om 20:21 heeft Richard Purdie <
>> > richard.purdie@linuxfoundation.org> het volgende geschreven:
>> >
>> > On Sat, 2016-06-18 at 15:08 +0200, Koen Kooi wrote:
>> > > > Op 4 jun. 2016, om 15:09 heeft Richard Purdie <
>> > > > richard.purdie@linuxfoundation.org> het volgende geschreven:
>> > > >
>> > > > On Sat, 2016-06-04 at 10:41 +0200, Koen Kooi wrote:
>> > > > > ping 2
>> > > >
>> > > > It would be helpful if you'd cc'd the person who's patch you
>> > > > were
>> > > > suggesting we revert. I added Sasha to cc.
>> > >
>> > > Since the original committer has shown zero interest in
>> > > responding
>> > > here or fixing the problem in the past month, can you please
>> > > commit
>> > > this? This fixes a clear regression, which alone should have been
>> > > reason enough to commit this.
>> >
>> > Did
>> > http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=7028192246552f
>> > d9e4aa3674da9c30670fd4ec86 fix this?
>>
>> Don’t know since I use OE, not poky.
>
> Ok. Let me paste the hash in "From OE-Core rev: 46bc438374de74af76d288520c6252c9b7840767"
> into a new url. I obviously have nothing better to do with my time.
>
> Did http://git.openembedded.org/openembedded-core/commit/?id=46bc438374de74af76d288520c6252c9b7840767
> fix this?
>
> Or in case you also don't have a web browser, did revision in the
> openembedded-core repository with hash
> 46bc438374de74af76d288520c6252c9b7840767 fix this issue?

With that included and the overlayed image.bbclass dropped the build
succeeds. So the revert isn't needed anymore.

Patch hide | download patch | download mbox

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 9f4c83f..df3bd3a 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -410,13 +410,9 @@  python () {
                     # Create input image first.
                     gen_conversion_cmds(type)
                     localdata.setVar('type', type)
-                    cmd = "\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True)
-                    if cmd not in cmds:
-                        cmds.append(cmd)
+                    cmds.append("\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True))
                     vardeps.add('COMPRESS_CMD_' + ctype)
-                    subimage = type + "." + ctype
-                    if subimage not in subimages:
-                        subimages.append(subimage)
+                    subimages.append(type + "." + ctype)
                     if type not in alltypes:
                         rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"))