Re: [OE-core][PATCH v2 2/2] kernel-fitimage: use correct kernel image

[Alexandre Belloni <alexandre.belloni@bootlin.com>]

Hello,

This series causes the following failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/2699/steps/15/logs/stdio

2021-10-12 00:31:47,557 - oe-selftest - INFO - fitimage.FitImageTests.test_initramfs_bundle (subunit.RemotedTestCase)
2021-10-12 00:31:47,665 - oe-selftest - INFO -  ... FAIL
Stderr:
2021-10-11 21:55:16,664 - oe-selftest - INFO - Adding: "include selftest.inc" in /home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-16604/conf/local.conf
2021-10-11 21:55:16,665 - oe-selftest - INFO - Adding: "include bblayers.inc" in bblayers.conf
2021-10-12 00:31:47,666 - oe-selftest - INFO - 10: 3/13 335/444 (2817.06s) (fitimage.FitImageTests.test_initramfs_bundle)
2021-10-12 00:31:47,666 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/fitimage.py", line 803, in test_initramfs_bundle
    self.assertTrue(test_passed == True,"kernel node does not match expectation")
  File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/python3.9/unittest/case.py", line 682, in assertTrue
    raise self.failureException(msg)
AssertionError: False is not true : kernel node does not match expectation

It failed on all 4 oe-selftest builds

On 06/10/2021 09:00:31+0200, Andrej Valek wrote:
> Even if initramfs_bundle_path was used, a wrong compression was reflected
> in output its template file. Use linux.bin as universal kernel image.
> The linux.bin file covers both cases.
> 
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com>
> ---
>  meta/classes/kernel-fitimage.bbclass | 17 +----------------
>  1 file changed, 1 insertion(+), 16 deletions(-)
> 
> diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
> index 886ed13029..8718ce7e16 100644
> --- a/meta/classes/kernel-fitimage.bbclass
> +++ b/meta/classes/kernel-fitimage.bbclass
> @@ -495,22 +495,7 @@ fitimage_assemble() {
>  	fitimage_emit_section_maint $1 imagestart
>  
>  	uboot_prep_kimage
> -
> -	if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
> -		initramfs_bundle_path="arch/"${UBOOT_ARCH}"/boot/"${KERNEL_IMAGETYPE_REPLACEMENT}".initramfs"
> -		if [ -e "$initramfs_bundle_path" ]; then
> -
> -			#
> -			# Include the kernel/rootfs bundle.
> -			#
> -
> -			fitimage_emit_section_kernel $1 $kernelcount "$initramfs_bundle_path" "$linux_comp"
> -		else
> -			bbwarn "$initramfs_bundle_pat not found."
> -		fi
> -	else
> -		fitimage_emit_section_kernel $1 $kernelcount linux.bin "$linux_comp"
> -	fi
> +	fitimage_emit_section_kernel $1 $kernelcount linux.bin "$linux_comp"
>  
>  	#
>  	# Step 2: Prepare a DTB image section
> -- 
> 2.31.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#156674): https://lists.openembedded.org/g/openembedded-core/message/156674
> Mute This Topic: https://lists.openembedded.org/mt/86113979/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com