[OE-core] [PATCH] Revert "image.bbclass: don't execute compression commands multiple times"

[Koen Kooi]

ping

> Op 23 mei 2016, om 19:50 heeft Koen Kooi <koen.kooi at 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 at 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_SUFFIX}.${type}"))
> 
> -- 
> 2.4.3
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>