| Message ID | 20230303105410.2413-1-romuald.jeanne@st.com |
|---|---|
| State | New |
| Headers | show |
| Series | image_types: fix vname var init in multiubi_mkfs() function | expand |
Hello,
This still fails on the autobuilders:
2023-03-03 19:19:37,778 - oe-selftest - INFO - imagefeatures.ImageFeatures.test_image_fstypes (subunit.RemotedTestCase)
2023-03-03 19:19:37,779 - oe-selftest - INFO - ... FAIL
2023-03-03 19:19:37,779 - oe-selftest - INFO - 2: 21/40 359/523 (131.33s) (0 failed) (imagefeatures.ImageFeatures.test_image_fstypes)
2023-03-03 19:19:37,779 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/lib/oeqa/selftest/cases/imagefeatures.py", line 224, in test_image_fstypes
self.assertTrue(os.path.exists(image_path),
File "/usr/lib64/python3.11/unittest/case.py", line 715, in assertTrue
raise self.failureException(msg)
AssertionError: False is not true : ubi image /home/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-3612031/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.ubi doesn't exist
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/4878/steps/14/logs/stdio
I'm attaching the relevant logs.
On 03/03/2023 11:54:10+0100, Romuald Jeanne via lists.openembedded.org wrote:
> From: Romuald JEANNE <romuald.jeanne@st.com>
>
> As vname var is needed in multiubi_mkfs() function, we need to keep it
> defined and use it as parameter to the new write_ubi_config() function.
>
> See [YOCTO #15027]
>
> Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
> ---
> meta/classes-recipe/image_types.bbclass | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass
> index 764e6a5574..77cb22cf9c 100644
> --- a/meta/classes-recipe/image_types.bbclass
> +++ b/meta/classes-recipe/image_types.bbclass
> @@ -157,11 +157,7 @@ UBI_VOLTYPE ?= "dynamic"
> UBI_IMGTYPE ?= "ubifs"
>
> write_ubi_config() {
> - if [ -z "$1" ]; then
> - local vname=""
> - else
> - local vname="_$1"
> - fi
> + local vname="$1"
>
> cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg
> [ubifs]
> @@ -183,7 +179,12 @@ multiubi_mkfs() {
> bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details"
> fi
>
> - write_ubi_config "$3"
> + if [ -z "$1" ]; then
> + local vname=""
> + else
> + local vname="_$3"
> + fi
> + write_ubi_config "${vname}"
>
> if [ -n "$vname" ]; then
> mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args}
> --
> 2.17.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#177985): https://lists.openembedded.org/g/openembedded-core/message/177985
> Mute This Topic: https://lists.openembedded.org/mt/97359377/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 764e6a5574..77cb22cf9c 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -157,11 +157,7 @@ UBI_VOLTYPE ?= "dynamic" UBI_IMGTYPE ?= "ubifs" write_ubi_config() { - if [ -z "$1" ]; then - local vname="" - else - local vname="_$1" - fi + local vname="$1" cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg [ubifs] @@ -183,7 +179,12 @@ multiubi_mkfs() { bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" fi - write_ubi_config "$3" + if [ -z "$1" ]; then + local vname="" + else + local vname="_$3" + fi + write_ubi_config "${vname}" if [ -n "$vname" ]; then mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args}