| Message ID | 20230803131658.86448-1-peter.marko@siemens.com |
|---|---|
| State | Accepted |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [meta-swupdate,kirkstone,v3] image_types_zchunk: fix IMAGE_NAME | expand |
Hi Stefano Same is also pending here: https://github.com/sbabic/meta-swupdate/pull/26 Regards Adrian Peter Marko schrieb am Donnerstag, 3. August 2023 um 15:18:06 UTC+2: > The backported code does not work properly in kirkstone 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...@siemens.com> > --- > classes/image_types_zchunk.bbclass | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/classes/image_types_zchunk.bbclass > b/classes/image_types_zchunk.bbclass > index 2c477ba..fe73c34 100644 > --- a/classes/image_types_zchunk.bbclass > +++ b/classes/image_types_zchunk.bbclass > @@ -1,7 +1,7 @@ > 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" > -- > 2.30.2 > >
Hi Adrian, On 15.08.23 18:45, Adrian Freihofer wrote: > Hi Stefano > > Same is also pending here: https://github.com/sbabic/meta-swupdate/pull/26 Applied to kirkstone, thanks for remind. Regards, Stefano > > Regards > Adrian > > Peter Marko schrieb am Donnerstag, 3. August 2023 um 15:18:06 UTC+2: > > The backported code does not work properly in kirkstone branch > because kirkstone does not have following commit: > https://git.openembedded.org/openembedded-core/commit/?id=26d97acc71379ab6702fa54a23b6542a3f51779c <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...@siemens.com> > --- > classes/image_types_zchunk.bbclass | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/classes/image_types_zchunk.bbclass > b/classes/image_types_zchunk.bbclass > index 2c477ba..fe73c34 100644 > --- a/classes/image_types_zchunk.bbclass > +++ b/classes/image_types_zchunk.bbclass > @@ -1,7 +1,7 @@ > 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" > -- > 2.30.2 > > -- > You received this message because you are subscribed to the Google > Groups "swupdate" group. > To unsubscribe from this group and stop receiving emails from it, send > an email to swupdate+unsubscribe@googlegroups.com > <mailto:swupdate+unsubscribe@googlegroups.com>. > To view this discussion on the web visit > https://groups.google.com/d/msgid/swupdate/9f752f71-4dfc-437e-92dd-9fc48aee7601n%40googlegroups.com <https://groups.google.com/d/msgid/swupdate/9f752f71-4dfc-437e-92dd-9fc48aee7601n%40googlegroups.com?utm_medium=email&utm_source=footer>.
diff --git a/classes/image_types_zchunk.bbclass b/classes/image_types_zchunk.bbclass index 2c477ba..fe73c34 100644 --- a/classes/image_types_zchunk.bbclass +++ b/classes/image_types_zchunk.bbclass @@ -1,7 +1,7 @@ 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 kirkstone 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)