[meta-swupdate][kirkstone][PATCH] image_types_zchunk: fix IMAGE_NAME

[Peter Marko]

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...@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"
--
2.30.2

[Stefano Babic]

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: sba...@denx.de
=====================================================================

[Peter Marko]

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>
---

0001-image_types_zchunk-fix-IMAGE_NAME.patch | 33 ++++++++++++++++++++
classes/image_types_zchunk.bbclass | 4 +--
2 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 0001-image_types_zchunk-fix-IMAGE_NAME.patch

diff --git a/0001-image_types_zchunk-fix-IMAGE_NAME.patch b/0001-image_types_zchunk-fix-IMAGE_NAME.patch
new file mode 100644
index 0000000..14dd54f
--- /dev/null
+++ b/0001-image_types_zchunk-fix-IMAGE_NAME.patch
@@ -0,0 +1,33 @@
+From 4a2f97a5838aa0afde69d5b5829b2a50805a0802 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter...@siemens.com>
+Date: Thu, 3 Aug 2023 15:03:11 +0200
+Subject: [meta-swupdate][kirkstone][PATCH] image_types_zchunk: fix IMAGE_NAME
+
+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...@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"
+--
+2.30.2
+
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:]'`"

[Peter Marko]

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:]'`"

[Adrian Freihofer]

Hi Stefano

Same is also pending here: https://github.com/sbabic/meta-swupdate/pull/26

Regards

Adrian

[Stefano Babic]

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>

> --
> 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+u...@googlegroups.com
> <mailto:swupdate+u...@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>.

[Marko, Peter]

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

[Stefano Babic]

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