diff mbox series

imagetypes XZ_OPTIONS replaced by XZ_DEFAULTS defined in bitbake.comf

Message ID 20230209224148.60152-1-roberto.foglietta@linuxteam.org
State Superseded, archived
Headers show
Series imagetypes XZ_OPTIONS replaced by XZ_DEFAULTS defined in bitbake.comf | expand

Commit Message

roberto.foglietta@linuxteam.org Feb. 9, 2023, 10:41 p.m. UTC 
From: Anton Mikanovich <amikan@ilbers.de>

imagetypes, bugfix

A previous patch moved XZ_ variables declarations into bitbake.conf from
the imagetypes class. In such patch the XZ_OPTIONS has been renamed in
XZ_DEFAULTS but the XZ_ command in imagetype class has not been updated.
This patch fixed this bug which decreases performance and alters the
expected behaviour.

Requires:

 * bitbake.conf: declare default XZ and ZSTD options

Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
---
 meta/classes/imagetypes.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Henning Schild Feb. 10, 2023, 10:27 a.m. UTC | #1 
Am Thu,  9 Feb 2023 23:41:48 +0100
schrieb roberto.foglietta@linuxteam.org:

> From: Anton Mikanovich <amikan@ilbers.de>
> 
> imagetypes, bugfix
> 
> A previous patch moved XZ_ variables declarations into bitbake.conf
> from the imagetypes class. In such patch the XZ_OPTIONS has been
> renamed in XZ_DEFAULTS but the XZ_ command in imagetype class has not
> been updated. This patch fixed this bug which decreases performance
> and alters the expected behaviour.
> 
> Requires:
> 
>  * bitbake.conf: declare default XZ and ZSTD options

Fixes: 924aa382ca26 ("bitbake.conf: declare default XZ and ZSTD options")
> Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>

Good catch. ACK, thanks!

Henning

> ---
>  meta/classes/imagetypes.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/imagetypes.bbclass
> b/meta/classes/imagetypes.bbclass index 0cff440f..7d193d2e 100644
> --- a/meta/classes/imagetypes.bbclass
> +++ b/meta/classes/imagetypes.bbclass
> @@ -98,5 +98,5 @@ IMAGE_CONVERSIONS = "gz xz"
>  CONVERSION_CMD:gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c
> --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'"
> CONVERSION_DEPS:gz = "gzip" 
> -CONVERSION_CMD:xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS}
> ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_CMD:xz =
> "${SUDO_CHROOT} sh -c 'xz -c ${XZ_DEFAULTS} ${IMAGE_FILE_CHROOT} >
> ${IMAGE_FILE_CHROOT}.xz'" CONVERSION_DEPS:xz = "xz-utils"
Henning Schild Feb. 10, 2023, 10:31 a.m. UTC | #2 
Am Fri, 10 Feb 2023 11:27:14 +0100
schrieb Henning Schild <henning.schild@siemens.com>:

> Am Thu,  9 Feb 2023 23:41:48 +0100
> schrieb roberto.foglietta@linuxteam.org:
> 
> > From: Anton Mikanovich <amikan@ilbers.de>
> > 
> > imagetypes, bugfix
> > 
> > A previous patch moved XZ_ variables declarations into bitbake.conf
> > from the imagetypes class. In such patch the XZ_OPTIONS has been
> > renamed in XZ_DEFAULTS but the XZ_ command in imagetype class has
> > not been updated. This patch fixed this bug which decreases
> > performance and alters the expected behaviour.
> > 
> > Requires:
> > 
> >  * bitbake.conf: declare default XZ and ZSTD options  
> 
> Fixes: 924aa382ca26 ("bitbake.conf: declare default XZ and ZSTD
> options")

Not something isar uses, but it is nice to know and does not do harm.

taken from
https://www.kernel.org/doc/html/v4.17/process/submitting-patches.html#describe-your-changes

last bits of the paragraph

Henning

> > Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>  
> 
> Good catch. ACK, thanks!
> 
> Henning
> 
> > ---
> >  meta/classes/imagetypes.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes/imagetypes.bbclass
> > b/meta/classes/imagetypes.bbclass index 0cff440f..7d193d2e 100644
> > --- a/meta/classes/imagetypes.bbclass
> > +++ b/meta/classes/imagetypes.bbclass
> > @@ -98,5 +98,5 @@ IMAGE_CONVERSIONS = "gz xz"
> >  CONVERSION_CMD:gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c
> > --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'"
> > CONVERSION_DEPS:gz = "gzip" 
> > -CONVERSION_CMD:xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS}
> > ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_CMD:xz
> > = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_DEFAULTS} ${IMAGE_FILE_CHROOT} >
> > ${IMAGE_FILE_CHROOT}.xz'" CONVERSION_DEPS:xz = "xz-utils"  
>
Roberto A. Foglietta Feb. 10, 2023, 11:15 a.m. UTC | #3 
On Fri, 10 Feb 2023 at 11:32, Henning Schild <henning.schild@siemens.com> wrote:
>
> Not something isar uses, but it is nice to know and does not do harm.
>

ISAR uses this value when producing the .xz image.

I have sent the v2 patch with the patch description correction.
Henning Schild Feb. 10, 2023, 11:28 a.m. UTC | #4 
Am Fri, 10 Feb 2023 12:15:35 +0100
schrieb "Roberto A. Foglietta" <roberto.foglietta@gmail.com>:

> On Fri, 10 Feb 2023 at 11:32, Henning Schild
> <henning.schild@siemens.com> wrote:
> >
> > Not something isar uses, but it is nice to know and does not do
> > harm. 
> 
> ISAR uses this value when producing the .xz image.

I was talking about the "Fixes:" tag. Not needed but nice to have

Henning

> I have sent the v2 patch with the patch description correction.
diff mbox series

Patch

diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass
index 0cff440f..7d193d2e 100644
--- a/meta/classes/imagetypes.bbclass
+++ b/meta/classes/imagetypes.bbclass
@@ -98,5 +98,5 @@  IMAGE_CONVERSIONS = "gz xz"
 CONVERSION_CMD:gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'"
 CONVERSION_DEPS:gz = "gzip"
 
-CONVERSION_CMD:xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'"
+CONVERSION_CMD:xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_DEFAULTS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'"
 CONVERSION_DEPS:xz = "xz-utils"