| Message ID | 20230803130610.86059-1-peter.marko@siemens.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [meta-swupdate,kirkstone] image_types_zchunk: fix IMAGE_NAME | expand |
On 03.08.23 15:06, 'Peter Marko' via swupdate wrote: > The backported code does not work properly in kinrkstone branch > because kirkstone does not have following commit: > https://git.openembedded.org/openembedded-core/commit/?id=26d97acc71379ab6702fa54a23b6542a3f51779c > > So re-add ${IMAGE_NAME_SUFFIX} to all ${IMAGE_NAME} uses. > > Signed-off-by: Peter Marko <peter.marko@siemens.com> > --- > classes/image_types_zchunk.bbclass | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/classes/image_types_zchunk.bbclass b/classes/image_types_zchunk.bbclass > index 2c477ba..06ca694 100644 > --- a/classes/image_types_zchunk.bbclass > +++ b/classes/image_types_zchunk.bbclass > @@ -1,7 +1,6 @@ > CONVERSIONTYPES += "zck zckheader" > > -CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}.${type}" > -CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}.${type} of=${IMAGE_NAME}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" > - > +CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" > +CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} of=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" > CONVERSION_DEPENDS_zck = "zchunk-native" > CONVERSION_DEPENDS_zckheader = "zchunk-native" Thanks, I haven't noted this - I will merge it soon. Regards, Stefano
Hi Stefano, Thanks for merging. You should also pick this to dunfell. I just don't have a setup to test if there are more problems when going to that release. Regards, Peter -----Original Message----- From: Stefano Babic <sbabic@denx.de> Sent: Thursday, August 3, 2023 15:13 To: Marko, Peter (ADV D EU SK BFS1) <Peter.Marko@siemens.com>; swupdate@googlegroups.com Subject: Re: [swupdate] [meta-swupdate][kirkstone][PATCH] image_types_zchunk: fix IMAGE_NAME > On 03.08.23 15:06, 'Peter Marko' via swupdate wrote: > > The backported code does not work properly in kinrkstone branch > > because kirkstone does not have following commit: > > https://git.openembedded.org/openembedded-core/commit/?id=26d97acc7137 > > 9ab6702fa54a23b6542a3f51779c > > > > So re-add ${IMAGE_NAME_SUFFIX} to all ${IMAGE_NAME} uses. > > > > Signed-off-by: Peter Marko <peter.marko@siemens.com> > > --- > > classes/image_types_zchunk.bbclass | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/classes/image_types_zchunk.bbclass > > b/classes/image_types_zchunk.bbclass > > index 2c477ba..06ca694 100644 > > --- a/classes/image_types_zchunk.bbclass > > +++ b/classes/image_types_zchunk.bbclass > > @@ -1,7 +1,6 @@ > > CONVERSIONTYPES += "zck zckheader" > > > > -CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}.${type}" > > -CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}.${type} of=${IMAGE_NAME}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" > > - > > +CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" > > +CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} of=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} | grep > 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" > > CONVERSION_DEPENDS_zck = "zchunk-native" > > CONVERSION_DEPENDS_zckheader = "zchunk-native" > > Thanks, I haven't noted this - I will merge it soon. > > Regards, > Stefano > > -- > ===================================================================== > DENX Software Engineering GmbH, Managing Director: Erika Unter > HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany > Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de > =====================================================================
Hi Peter, On 16.08.23 19:41, Marko, Peter wrote: > Hi Stefano, > > Thanks for merging. > You should also pick this to dunfell. Done. Regards, Stefano > I just don't have a setup to test if there are more problems when going to that release. > > Regards, > Peter > > -----Original Message----- > From: Stefano Babic <sbabic@denx.de> > Sent: Thursday, August 3, 2023 15:13 > To: Marko, Peter (ADV D EU SK BFS1) <Peter.Marko@siemens.com>; swupdate@googlegroups.com > Subject: Re: [swupdate] [meta-swupdate][kirkstone][PATCH] image_types_zchunk: fix IMAGE_NAME > >> On 03.08.23 15:06, 'Peter Marko' via swupdate wrote: >>> The backported code does not work properly in kinrkstone branch >>> because kirkstone does not have following commit: >>> https://git.openembedded.org/openembedded-core/commit/?id=26d97acc7137 >>> 9ab6702fa54a23b6542a3f51779c >>> >>> So re-add ${IMAGE_NAME_SUFFIX} to all ${IMAGE_NAME} uses. >>> >>> Signed-off-by: Peter Marko <peter.marko@siemens.com> >>> --- >>> classes/image_types_zchunk.bbclass | 5 ++--- >>> 1 file changed, 2 insertions(+), 3 deletions(-) >>> >>> diff --git a/classes/image_types_zchunk.bbclass >>> b/classes/image_types_zchunk.bbclass >>> index 2c477ba..06ca694 100644 >>> --- a/classes/image_types_zchunk.bbclass >>> +++ b/classes/image_types_zchunk.bbclass >>> @@ -1,7 +1,6 @@ >>> CONVERSIONTYPES += "zck zckheader" >>> >>> -CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}.${type}" >>> -CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}.${type} of=${IMAGE_NAME}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" >>> - >>> +CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" >>> +CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} of=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} | grep > 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" >>> CONVERSION_DEPENDS_zck = "zchunk-native" >>> CONVERSION_DEPENDS_zckheader = "zchunk-native" >> >> Thanks, I haven't noted this - I will merge it soon. >> >> Regards, >> Stefano >> >> -- >> ===================================================================== >> DENX Software Engineering GmbH, Managing Director: Erika Unter >> HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany >> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de >> ===================================================================== >
diff --git a/classes/image_types_zchunk.bbclass b/classes/image_types_zchunk.bbclass index 2c477ba..06ca694 100644 --- a/classes/image_types_zchunk.bbclass +++ b/classes/image_types_zchunk.bbclass @@ -1,7 +1,6 @@ CONVERSIONTYPES += "zck zckheader" -CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}.${type}" -CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}.${type} of=${IMAGE_NAME}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" - +CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" +CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} of=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" CONVERSION_DEPENDS_zck = "zchunk-native" CONVERSION_DEPENDS_zckheader = "zchunk-native"
The backported code does not work properly in kinrkstone branch because kirkstone does not have following commit: https://git.openembedded.org/openembedded-core/commit/?id=26d97acc71379ab6702fa54a23b6542a3f51779c So re-add ${IMAGE_NAME_SUFFIX} to all ${IMAGE_NAME} uses. Signed-off-by: Peter Marko <peter.marko@siemens.com> --- classes/image_types_zchunk.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)