diff mbox series

[meta-swupdate,kirkstone,v2] image_types_zchunk: fix IMAGE_NAME

Message ID 20230803131413.86271-1-peter.marko@siemens.com
State Changes Requested
Delegated to: Stefano Babic
Headers show
Series [meta-swupdate,kirkstone,v2] image_types_zchunk: fix IMAGE_NAME | expand

Commit Message

Marko, Peter Aug. 3, 2023, 1:14 p.m. UTC 
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>
---
 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 mbox series

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.marko@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.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"
+-- 
+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:]'`"
+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"