diff mbox series

image_types: fix vname var init in multiubi_mkfs() function

Message ID 20230309075452.6463-1-romuald.jeanne@st.com
State Accepted, archived
Commit 8b5e1cce35e129b21d871ab45b03811fdb6eaf8f
Headers show
Series image_types: fix vname var init in multiubi_mkfs() function | expand

Commit Message

Romuald JEANNE March 9, 2023, 7:54 a.m. UTC 
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(-)

Comments

Martin Jansa March 9, 2023, 8:30 a.m. UTC | #1 
On Thu, Mar 9, 2023 at 8:55 AM Romuald Jeanne via lists.openembedded.org
<romuald.jeanne=st.com@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..c6cb8f5336 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"
>

Did you drop the _ separator intentionally?
Romuald JEANNE March 9, 2023, 9:28 a.m. UTC | #2 
Hello,

The ‘write_ubi_config()’ is called through ‘multiubi_mkfs()’ where the _ separator is managed with proper init of ‘vname’ var.
So I didn’t dropped the _ separator, it is managed on calling function side.

Best regards,

Romuald JEANNE

From: Martin Jansa <martin.jansa@gmail.com>
Sent: jeudi 9 mars 2023 09:31
To: Romuald JEANNE <romuald.jeanne@st.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] image_types: fix vname var init in multiubi_mkfs() function

On Thu, Mar 9, 2023 at 8:55 AM Romuald Jeanne via lists.openembedded.org<http://lists.openembedded.org> <romuald.jeanne=st.com@lists.openembedded.org<mailto:st.com@lists.openembedded.org>> wrote:
From: Romuald JEANNE <romuald.jeanne@st.com<mailto: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<mailto: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..c6cb8f5336 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"

Did you drop the _ separator intentionally?


ST Restricted
Martin Jansa March 9, 2023, 9:46 a.m. UTC | #3 
-               local vname="_$1"
-       fi
+       local vname="$1"

        cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg

_ surely got removed from this ubinize filename, right?

On Thu, Mar 9, 2023 at 10:28 AM Romuald JEANNE <romuald.jeanne@st.com>
wrote:

> Hello,
>
>
>
> The ‘write_ubi_config()’ is called through ‘multiubi_mkfs()’ where the _
> separator is managed with proper init of ‘vname’ var.
>
> So I didn’t dropped the _ separator, it is managed on calling function
> side.
>
>
>
> Best regards,
>
>
>
> Romuald JEANNE
>
>
>
> *From:* Martin Jansa <martin.jansa@gmail.com>
> *Sent:* jeudi 9 mars 2023 09:31
> *To:* Romuald JEANNE <romuald.jeanne@st.com>
> *Cc:* openembedded-core@lists.openembedded.org
> *Subject:* Re: [OE-core] [PATCH] image_types: fix vname var init in
> multiubi_mkfs() function
>
>
>
> On Thu, Mar 9, 2023 at 8:55 AM Romuald Jeanne via lists.openembedded.org
> <romuald.jeanne=st.com@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..c6cb8f5336 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"
>
>
>
> Did you drop the _ separator intentionally?
>
>
>
> ST Restricted
>
Martin Jansa March 9, 2023, 9:50 a.m. UTC | #4 
Sorry, didn't get enough coffee today, I was reading it wrong.

On Thu, Mar 9, 2023 at 10:46 AM Martin Jansa <martin.jansa@gmail.com> wrote:

> -               local vname="_$1"
> -       fi
> +       local vname="$1"
>
>         cat <<EOF > ubinize${vname}-${IMAGE_NAME}.cfg
>
> _ surely got removed from this ubinize filename, right?
>
> On Thu, Mar 9, 2023 at 10:28 AM Romuald JEANNE <romuald.jeanne@st.com>
> wrote:
>
>> Hello,
>>
>>
>>
>> The ‘write_ubi_config()’ is called through ‘multiubi_mkfs()’ where the _
>> separator is managed with proper init of ‘vname’ var.
>>
>> So I didn’t dropped the _ separator, it is managed on calling function
>> side.
>>
>>
>>
>> Best regards,
>>
>>
>>
>> Romuald JEANNE
>>
>>
>>
>> *From:* Martin Jansa <martin.jansa@gmail.com>
>> *Sent:* jeudi 9 mars 2023 09:31
>> *To:* Romuald JEANNE <romuald.jeanne@st.com>
>> *Cc:* openembedded-core@lists.openembedded.org
>> *Subject:* Re: [OE-core] [PATCH] image_types: fix vname var init in
>> multiubi_mkfs() function
>>
>>
>>
>> On Thu, Mar 9, 2023 at 8:55 AM Romuald Jeanne via lists.openembedded.org
>> <romuald.jeanne=st.com@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..c6cb8f5336 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"
>>
>>
>>
>> Did you drop the _ separator intentionally?
>>
>>
>>
>> ST Restricted
>>
>
diff mbox series

Patch

diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass
index 764e6a5574..c6cb8f5336 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 "$3" ]; 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}