cip-dev.lists.cip-project.org archive mirror
 help / color / mirror / Atom feed
* [cip-dev][isar-cip-core][PATCH 0/2] Fix for issue gitlab #14
@ 2021-09-28 18:49 Quirin Gylstorff
  2021-09-28 18:49 ` Q. Gylstorff
                   ` (2 more replies)
  0 siblings, 3 replies; 19+ messages in thread
From: Quirin Gylstorff @ 2021-09-28 18:49 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

[-- Attachment #1: Type: text/plain, Size: 826 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This Fixes [1]
.swu file is not getting generated for checking new swupdate handler (#14)

This issue occured due to [1]: If multiple `?=` assignments are used
the first of those assignments ends up getting used.

[1]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
[2]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value


Quirin Gylstorff (2):
  kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  kas/opt/efibootguard: Move setting of IMAGE_TYPE

 kas/opt/efibootguard.yml |  1 -
 kas/opt/swupdate.yml     |  4 ++--
 kas/opt/wic-img.yml      | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 kas/opt/wic-img.yml

-- 
2.30.2


[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6756): https://lists.cip-project.org/g/cip-dev/message/6756
Mute This Topic: https://lists.cip-project.org/mt/85931979/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* [cip-dev][isar-cip-core][PATCH 0/2] Fix for issue gitlab #14
  2021-09-28 18:49 [cip-dev][isar-cip-core][PATCH 0/2] Fix for issue gitlab #14 Quirin Gylstorff
@ 2021-09-28 18:49 ` Q. Gylstorff
  2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE Q. Gylstorff
  2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE Q. Gylstorff
  2 siblings, 0 replies; 19+ messages in thread
From: Q. Gylstorff @ 2021-09-28 18:49 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This Fixes [1]
.swu file is not getting generated for checking new swupdate handler (#14)

This issue occured due to [1]: If multiple `?=` assignments are used
the first of those assignments ends up getting used.

[1]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
[2]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value


Quirin Gylstorff (2):
  kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  kas/opt/efibootguard: Move setting of IMAGE_TYPE

 kas/opt/efibootguard.yml |  1 -
 kas/opt/swupdate.yml     |  4 ++--
 kas/opt/wic-img.yml      | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 kas/opt/wic-img.yml

-- 
2.30.2



^ permalink raw reply	[flat|nested] 19+ messages in thread

* [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-09-28 18:49 [cip-dev][isar-cip-core][PATCH 0/2] Fix for issue gitlab #14 Quirin Gylstorff
  2021-09-28 18:49 ` Q. Gylstorff
@ 2021-09-28 18:49 ` Q. Gylstorff
  2021-09-28 18:49   ` Quirin Gylstorff
  2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE Q. Gylstorff
  2 siblings, 1 reply; 19+ messages in thread
From: Q. Gylstorff @ 2021-09-28 18:49 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Replace the default assignment to ensure the generation of the
swu file. As stated in [1]: If multiple `?=` assignments are used
the first of those assignments ends up getting used.

This fixes [2].

[1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
[2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/swupdate.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index 7d86ad5..3cc02a3 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -19,5 +19,5 @@ local_conf_header:
     IMAGE_INSTALL_append = " swupdate"
 
   wic-swu: |
-    IMAGE_TYPE ?= "wic-swu-img"
-    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
+    IMAGE_TYPE = "wic-swu-img"
+    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
-- 
2.30.2



^ permalink raw reply	[flat|nested] 19+ messages in thread

* [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE Q. Gylstorff
@ 2021-09-28 18:49   ` Quirin Gylstorff
  2021-10-04  9:28     ` Jan Kiszka
  0 siblings, 1 reply; 19+ messages in thread
From: Quirin Gylstorff @ 2021-09-28 18:49 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Replace the default assignment to ensure the generation of the
swu file. As stated in [1]: If multiple `?=` assignments are used
the first of those assignments ends up getting used.

This fixes [2].

[1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
[2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/swupdate.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index 7d86ad5..3cc02a3 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -19,5 +19,5 @@ local_conf_header:
     IMAGE_INSTALL_append = " swupdate"
 
   wic-swu: |
-    IMAGE_TYPE ?= "wic-swu-img"
-    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
+    IMAGE_TYPE = "wic-swu-img"
+    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
-- 
2.30.2


[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6757): https://lists.cip-project.org/g/cip-dev/message/6757
Mute This Topic: https://lists.cip-project.org/mt/85931980/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE
  2021-09-28 18:49 [cip-dev][isar-cip-core][PATCH 0/2] Fix for issue gitlab #14 Quirin Gylstorff
  2021-09-28 18:49 ` Q. Gylstorff
  2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE Q. Gylstorff
@ 2021-09-28 18:49 ` Q. Gylstorff
  2021-09-28 18:49   ` Quirin Gylstorff
  2 siblings, 1 reply; 19+ messages in thread
From: Q. Gylstorff @ 2021-09-28 18:49 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This seperates the image type from the boot loader.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/efibootguard.yml |  1 -
 kas/opt/wic-img.yml      | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 kas/opt/wic-img.yml

diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index 705a76d..4e8be69 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -23,6 +23,5 @@ local_conf_header:
   efibootguard-wic: |
     WDOG_TIMEOUT ?= "60"
     WICVARS += "WDOG_TIMEOUT"
-    IMAGE_TYPE ?= "wic-img"
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
 
diff --git a/kas/opt/wic-img.yml b/kas/opt/wic-img.yml
new file mode 100644
index 0000000..2b02b42
--- /dev/null
+++ b/kas/opt/wic-img.yml
@@ -0,0 +1,19 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+# This kas file set the IMAGE_TYPE to wic-img
+# The device specific WKS_FILE needs to be set seperately.
+
+header:
+  version: 10
+
+local_conf_header:
+  image-type: |
+    IMAGE_TYPE = "wic-img"
-- 
2.30.2



^ permalink raw reply	[flat|nested] 19+ messages in thread

* [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE
  2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE Q. Gylstorff
@ 2021-09-28 18:49   ` Quirin Gylstorff
  2021-09-28 22:09     ` Jan Kiszka
  0 siblings, 1 reply; 19+ messages in thread
From: Quirin Gylstorff @ 2021-09-28 18:49 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This seperates the image type from the boot loader.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/efibootguard.yml |  1 -
 kas/opt/wic-img.yml      | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 kas/opt/wic-img.yml

diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index 705a76d..4e8be69 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -23,6 +23,5 @@ local_conf_header:
   efibootguard-wic: |
     WDOG_TIMEOUT ?= "60"
     WICVARS += "WDOG_TIMEOUT"
-    IMAGE_TYPE ?= "wic-img"
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
 
diff --git a/kas/opt/wic-img.yml b/kas/opt/wic-img.yml
new file mode 100644
index 0000000..2b02b42
--- /dev/null
+++ b/kas/opt/wic-img.yml
@@ -0,0 +1,19 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+# This kas file set the IMAGE_TYPE to wic-img
+# The device specific WKS_FILE needs to be set seperately.
+
+header:
+  version: 10
+
+local_conf_header:
+  image-type: |
+    IMAGE_TYPE = "wic-img"
-- 
2.30.2


[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6758): https://lists.cip-project.org/g/cip-dev/message/6758
Mute This Topic: https://lists.cip-project.org/mt/85931981/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE
  2021-09-28 18:49   ` Quirin Gylstorff
@ 2021-09-28 22:09     ` Jan Kiszka
  2021-09-29  7:53       ` Quirin Gylstorff
  0 siblings, 1 reply; 19+ messages in thread
From: Jan Kiszka @ 2021-09-28 22:09 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

[-- Attachment #1: Type: text/plain, Size: 1836 bytes --]

On 28.09.21 20:49, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> This seperates the image type from the boot loader.
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas/opt/efibootguard.yml |  1 -
>  kas/opt/wic-img.yml      | 19 +++++++++++++++++++
>  2 files changed, 19 insertions(+), 1 deletion(-)
>  create mode 100644 kas/opt/wic-img.yml
>
> diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
> index 705a76d..4e8be69 100644
> --- a/kas/opt/efibootguard.yml
> +++ b/kas/opt/efibootguard.yml
> @@ -23,6 +23,5 @@ local_conf_header:
>    efibootguard-wic: |
>      WDOG_TIMEOUT ?= "60"
>      WICVARS += "WDOG_TIMEOUT"
> -    IMAGE_TYPE ?= "wic-img"
>      WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>
> diff --git a/kas/opt/wic-img.yml b/kas/opt/wic-img.yml
> new file mode 100644
> index 0000000..2b02b42
> --- /dev/null
> +++ b/kas/opt/wic-img.yml
> @@ -0,0 +1,19 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2021
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +# This kas file set the IMAGE_TYPE to wic-img
> +# The device specific WKS_FILE needs to be set seperately.
> +
> +header:
> +  version: 10
> +
> +local_conf_header:
> +  image-type: |
> +    IMAGE_TYPE = "wic-img"
>

What's the purpose of this file? When should a user specify this option?
I think we already have too many option files and rather need to reduce
them than adding more.

Jan

PS: Something is currently off with archiving on lore.kernel.org.
Messages from this thread but also others appear twice there:
https://lore.kernel.org/cip-dev/20210928184946.GHmZQFBkA_wEzR1iQiB_04frBV52DnaYGHOSYtAdjok@z/T/#t

[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6759): https://lists.cip-project.org/g/cip-dev/message/6759
Mute This Topic: https://lists.cip-project.org/mt/85936916/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE
  2021-09-28 22:09     ` Jan Kiszka
@ 2021-09-29  7:53       ` Quirin Gylstorff
  2021-09-29  7:53         ` Gylstorff Quirin
  0 siblings, 1 reply; 19+ messages in thread
From: Quirin Gylstorff @ 2021-09-29  7:53 UTC (permalink / raw)
  To: Jan Kiszka, cip-dev, dinesh.kumar

[-- Attachment #1: Type: text/plain, Size: 2591 bytes --]



On 9/29/21 12:09 AM, Jan Kiszka wrote:
> On 28.09.21 20:49, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> This seperates the image type from the boot loader.
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   kas/opt/efibootguard.yml |  1 -
>>   kas/opt/wic-img.yml      | 19 +++++++++++++++++++
>>   2 files changed, 19 insertions(+), 1 deletion(-)
>>   create mode 100644 kas/opt/wic-img.yml
>>
>> diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
>> index 705a76d..4e8be69 100644
>> --- a/kas/opt/efibootguard.yml
>> +++ b/kas/opt/efibootguard.yml
>> @@ -23,6 +23,5 @@ local_conf_header:
>>     efibootguard-wic: |
>>       WDOG_TIMEOUT ?= "60"
>>       WICVARS += "WDOG_TIMEOUT"
>> -    IMAGE_TYPE ?= "wic-img"
>>       WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>
>> diff --git a/kas/opt/wic-img.yml b/kas/opt/wic-img.yml
>> new file mode 100644
>> index 0000000..2b02b42
>> --- /dev/null
>> +++ b/kas/opt/wic-img.yml
>> @@ -0,0 +1,19 @@
>> +#
>> +# CIP Core, generic profile
>> +#
>> +# Copyright (c) Siemens AG, 2021
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +# This kas file set the IMAGE_TYPE to wic-img
>> +# The device specific WKS_FILE needs to be set seperately.
>> +
>> +header:
>> +  version: 10
>> +
>> +local_conf_header:
>> +  image-type: |
>> +    IMAGE_TYPE = "wic-img"
>>
> 
> What's the purpose of this file? When should a user specify this option?
> I think we already have too many option files and rather need to reduce
> them than adding more.

My idea was to split the selection of efibootguard from the usage of 
wic-img so that we can generate other image formats together with 
efibootguard - in hindsight this is not necessary -  you can skip this 
patch as patch 1 of this set solves the issue alone.


Quirin
> 
> Jan
> 
> PS: Something is currently off with archiving on lore.kernel.org.
> Messages from this thread but also others appear twice there:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fcip-dev%2F20210928184946.GHmZQFBkA_wEzR1iQiB_04frBV52DnaYGHOSYtAdjok%40z%2FT%2F%23t&amp;data=04%7C01%7C6549bcd2-981c-4c06-8e1b-b5c6cc3441b4%40ad011.siemens.com%7Cc59cf4afa01c4ef24ff208d982ccb240%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637684637933939193%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=kNC4hyC3dM8p%2BUVHMpaGjs7O%2BmC76P4UKCXcIHMStO8%3D&amp;reserved=0
> 


[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6760): https://lists.cip-project.org/g/cip-dev/message/6760
Mute This Topic: https://lists.cip-project.org/mt/85936916/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE
  2021-09-29  7:53       ` Quirin Gylstorff
@ 2021-09-29  7:53         ` Gylstorff Quirin
  0 siblings, 0 replies; 19+ messages in thread
From: Gylstorff Quirin @ 2021-09-29  7:53 UTC (permalink / raw)
  To: Jan Kiszka, cip-dev, dinesh.kumar



On 9/29/21 12:09 AM, Jan Kiszka wrote:
> On 28.09.21 20:49, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> This seperates the image type from the boot loader.
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   kas/opt/efibootguard.yml |  1 -
>>   kas/opt/wic-img.yml      | 19 +++++++++++++++++++
>>   2 files changed, 19 insertions(+), 1 deletion(-)
>>   create mode 100644 kas/opt/wic-img.yml
>>
>> diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
>> index 705a76d..4e8be69 100644
>> --- a/kas/opt/efibootguard.yml
>> +++ b/kas/opt/efibootguard.yml
>> @@ -23,6 +23,5 @@ local_conf_header:
>>     efibootguard-wic: |
>>       WDOG_TIMEOUT ?= "60"
>>       WICVARS += "WDOG_TIMEOUT"
>> -    IMAGE_TYPE ?= "wic-img"
>>       WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>
>> diff --git a/kas/opt/wic-img.yml b/kas/opt/wic-img.yml
>> new file mode 100644
>> index 0000000..2b02b42
>> --- /dev/null
>> +++ b/kas/opt/wic-img.yml
>> @@ -0,0 +1,19 @@
>> +#
>> +# CIP Core, generic profile
>> +#
>> +# Copyright (c) Siemens AG, 2021
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +# This kas file set the IMAGE_TYPE to wic-img
>> +# The device specific WKS_FILE needs to be set seperately.
>> +
>> +header:
>> +  version: 10
>> +
>> +local_conf_header:
>> +  image-type: |
>> +    IMAGE_TYPE = "wic-img"
>>
> 
> What's the purpose of this file? When should a user specify this option?
> I think we already have too many option files and rather need to reduce
> them than adding more.

My idea was to split the selection of efibootguard from the usage of 
wic-img so that we can generate other image formats together with 
efibootguard - in hindsight this is not necessary -  you can skip this 
patch as patch 1 of this set solves the issue alone.


Quirin
> 
> Jan
> 
> PS: Something is currently off with archiving on lore.kernel.org.
> Messages from this thread but also others appear twice there:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fcip-dev%2F20210928184946.GHmZQFBkA_wEzR1iQiB_04frBV52DnaYGHOSYtAdjok%40z%2FT%2F%23t&amp;data=04%7C01%7C6549bcd2-981c-4c06-8e1b-b5c6cc3441b4%40ad011.siemens.com%7Cc59cf4afa01c4ef24ff208d982ccb240%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637684637933939193%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=kNC4hyC3dM8p%2BUVHMpaGjs7O%2BmC76P4UKCXcIHMStO8%3D&amp;reserved=0
> 



^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-09-28 18:49   ` Quirin Gylstorff
@ 2021-10-04  9:28     ` Jan Kiszka
  2021-10-04  9:28       ` Jan Kiszka
  2021-10-04 10:37       ` Jan Kiszka
  0 siblings, 2 replies; 19+ messages in thread
From: Jan Kiszka @ 2021-10-04  9:28 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

On 28.09.21 20:49, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Replace the default assignment to ensure the generation of the
> swu file. As stated in [1]: If multiple `?=` assignments are used
> the first of those assignments ends up getting used.
> 
> This fixes [2].
> 
> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas/opt/swupdate.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
> index 7d86ad5..3cc02a3 100644
> --- a/kas/opt/swupdate.yml
> +++ b/kas/opt/swupdate.yml
> @@ -19,5 +19,5 @@ local_conf_header:
>      IMAGE_INSTALL_append = " swupdate"
>  
>    wic-swu: |
> -    IMAGE_TYPE ?= "wic-swu-img"
> -    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> +    IMAGE_TYPE = "wic-swu-img"
> +    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> 
> 

Thanks, applied.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04  9:28     ` Jan Kiszka
@ 2021-10-04  9:28       ` Jan Kiszka
  2021-10-04 10:37       ` Jan Kiszka
  1 sibling, 0 replies; 19+ messages in thread
From: Jan Kiszka @ 2021-10-04  9:28 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar; +Cc: Quirin Gylstorff

[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]

On 28.09.21 20:49, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Replace the default assignment to ensure the generation of the
> swu file. As stated in [1]: If multiple `?=` assignments are used
> the first of those assignments ends up getting used.
> 
> This fixes [2].
> 
> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas/opt/swupdate.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
> index 7d86ad5..3cc02a3 100644
> --- a/kas/opt/swupdate.yml
> +++ b/kas/opt/swupdate.yml
> @@ -19,5 +19,5 @@ local_conf_header:
>      IMAGE_INSTALL_append = " swupdate"
>  
>    wic-swu: |
> -    IMAGE_TYPE ?= "wic-swu-img"
> -    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> +    IMAGE_TYPE = "wic-swu-img"
> +    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> 
> 

Thanks, applied.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6771): https://lists.cip-project.org/g/cip-dev/message/6771
Mute This Topic: https://lists.cip-project.org/mt/86062392/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04  9:28     ` Jan Kiszka
  2021-10-04  9:28       ` Jan Kiszka
@ 2021-10-04 10:37       ` Jan Kiszka
  2021-10-04 10:37         ` Jan Kiszka
                           ` (2 more replies)
  1 sibling, 3 replies; 19+ messages in thread
From: Jan Kiszka @ 2021-10-04 10:37 UTC (permalink / raw)
  To: Quirin Gylstorff; +Cc: dinesh.kumar, cip-dev

On 04.10.21 11:28, Jan Kiszka wrote:
> On 28.09.21 20:49, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Replace the default assignment to ensure the generation of the
>> swu file. As stated in [1]: If multiple `?=` assignments are used
>> the first of those assignments ends up getting used.
>>
>> This fixes [2].
>>
>> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
>> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>  kas/opt/swupdate.yml | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
>> index 7d86ad5..3cc02a3 100644
>> --- a/kas/opt/swupdate.yml
>> +++ b/kas/opt/swupdate.yml
>> @@ -19,5 +19,5 @@ local_conf_header:
>>      IMAGE_INSTALL_append = " swupdate"
>>  
>>    wic-swu: |
>> -    IMAGE_TYPE ?= "wic-swu-img"
>> -    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>> +    IMAGE_TYPE = "wic-swu-img"
>> +    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>
>>
> 
> Thanks, applied.
> 

Something seems to break:

https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/381889283

Could you have a look?

We also had fetching issues against gitlab, but those were "solved" by
retrying and were surely not triggered by this patch.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04 10:37       ` Jan Kiszka
@ 2021-10-04 10:37         ` Jan Kiszka
  2021-10-04 12:46         ` Gylstorff Quirin
  2021-10-04 13:27         ` [PATCH v2] " Q. Gylstorff
  2 siblings, 0 replies; 19+ messages in thread
From: Jan Kiszka @ 2021-10-04 10:37 UTC (permalink / raw)
  To: Quirin Gylstorff; +Cc: dinesh.kumar, cip-dev

[-- Attachment #1: Type: text/plain, Size: 1529 bytes --]

On 04.10.21 11:28, Jan Kiszka wrote:
> On 28.09.21 20:49, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Replace the default assignment to ensure the generation of the
>> swu file. As stated in [1]: If multiple `?=` assignments are used
>> the first of those assignments ends up getting used.
>>
>> This fixes [2].
>>
>> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
>> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>  kas/opt/swupdate.yml | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
>> index 7d86ad5..3cc02a3 100644
>> --- a/kas/opt/swupdate.yml
>> +++ b/kas/opt/swupdate.yml
>> @@ -19,5 +19,5 @@ local_conf_header:
>>      IMAGE_INSTALL_append = " swupdate"
>>  
>>    wic-swu: |
>> -    IMAGE_TYPE ?= "wic-swu-img"
>> -    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>> +    IMAGE_TYPE = "wic-swu-img"
>> +    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>
>>
> 
> Thanks, applied.
> 

Something seems to break:

https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/381889283

Could you have a look?

We also had fetching issues against gitlab, but those were "solved" by
retrying and were surely not triggered by this patch.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6772): https://lists.cip-project.org/g/cip-dev/message/6772
Mute This Topic: https://lists.cip-project.org/mt/86062392/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04 10:37       ` Jan Kiszka
  2021-10-04 10:37         ` Jan Kiszka
@ 2021-10-04 12:46         ` Gylstorff Quirin
  2021-10-04 12:46           ` Quirin Gylstorff
  2021-10-04 13:27         ` [PATCH v2] " Q. Gylstorff
  2 siblings, 1 reply; 19+ messages in thread
From: Gylstorff Quirin @ 2021-10-04 12:46 UTC (permalink / raw)
  To: Jan Kiszka; +Cc: dinesh.kumar, cip-dev



On 10/4/21 12:37 PM, Jan Kiszka wrote:
> On 04.10.21 11:28, Jan Kiszka wrote:
>> On 28.09.21 20:49, Quirin Gylstorff wrote:
>>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>>
>>> Replace the default assignment to ensure the generation of the
>>> swu file. As stated in [1]: If multiple `?=` assignments are used
>>> the first of those assignments ends up getting used.
>>>
>>> This fixes [2].
>>>
>>> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
>>> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
>>>
>>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> ---
>>>   kas/opt/swupdate.yml | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
>>> index 7d86ad5..3cc02a3 100644
>>> --- a/kas/opt/swupdate.yml
>>> +++ b/kas/opt/swupdate.yml
>>> @@ -19,5 +19,5 @@ local_conf_header:
>>>       IMAGE_INSTALL_append = " swupdate"
>>>   
>>>     wic-swu: |
>>> -    IMAGE_TYPE ?= "wic-swu-img"
>>> -    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>> +    IMAGE_TYPE = "wic-swu-img"
>>> +    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>>
>>>
>>
>> Thanks, applied.
>>
> 
> Something seems to break:
> 
> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/381889283
> 
> Could you have a look?
> 
> We also had fetching issues against gitlab, but those were "solved" by
> retrying and were surely not triggered by this patch.

Sure I will take a look.

Quirin

> 
> Jan
> 






^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04 12:46         ` Gylstorff Quirin
@ 2021-10-04 12:46           ` Quirin Gylstorff
  0 siblings, 0 replies; 19+ messages in thread
From: Quirin Gylstorff @ 2021-10-04 12:46 UTC (permalink / raw)
  To: Jan Kiszka; +Cc: dinesh.kumar, cip-dev

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]



On 10/4/21 12:37 PM, Jan Kiszka wrote:
> On 04.10.21 11:28, Jan Kiszka wrote:
>> On 28.09.21 20:49, Quirin Gylstorff wrote:
>>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>>
>>> Replace the default assignment to ensure the generation of the
>>> swu file. As stated in [1]: If multiple `?=` assignments are used
>>> the first of those assignments ends up getting used.
>>>
>>> This fixes [2].
>>>
>>> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
>>> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
>>>
>>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> ---
>>>   kas/opt/swupdate.yml | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
>>> index 7d86ad5..3cc02a3 100644
>>> --- a/kas/opt/swupdate.yml
>>> +++ b/kas/opt/swupdate.yml
>>> @@ -19,5 +19,5 @@ local_conf_header:
>>>       IMAGE_INSTALL_append = " swupdate"
>>>   
>>>     wic-swu: |
>>> -    IMAGE_TYPE ?= "wic-swu-img"
>>> -    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>> +    IMAGE_TYPE = "wic-swu-img"
>>> +    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>>>
>>>
>>
>> Thanks, applied.
>>
> 
> Something seems to break:
> 
> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/381889283
> 
> Could you have a look?
> 
> We also had fetching issues against gitlab, but those were "solved" by
> retrying and were surely not triggered by this patch.

Sure I will take a look.

Quirin

> 
> Jan
> 





[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6774): https://lists.cip-project.org/g/cip-dev/message/6774
Mute This Topic: https://lists.cip-project.org/mt/86062392/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* [PATCH v2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04 10:37       ` Jan Kiszka
  2021-10-04 10:37         ` Jan Kiszka
  2021-10-04 12:46         ` Gylstorff Quirin
@ 2021-10-04 13:27         ` Q. Gylstorff
  2021-10-04 13:27           ` [cip-dev] " Quirin Gylstorff
  2021-10-04 13:44           ` Jan Kiszka
  2 siblings, 2 replies; 19+ messages in thread
From: Q. Gylstorff @ 2021-10-04 13:27 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar, jan.kiszka

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Replace the default assignment to ensure the generation of the
swu file. As stated in [1]: If multiple `?=` assignments are used
the first of those assignments ends up getting used.

This fixes [2].

[1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
[2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/swupdate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index 7d86ad5..bd0f6e4 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -19,5 +19,5 @@ local_conf_header:
     IMAGE_INSTALL_append = " swupdate"
 
   wic-swu: |
-    IMAGE_TYPE ?= "wic-swu-img"
+    IMAGE_TYPE = "wic-swu-img"
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
-- 
2.30.2



^ permalink raw reply	[flat|nested] 19+ messages in thread

* [cip-dev] [PATCH v2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04 13:27         ` [PATCH v2] " Q. Gylstorff
@ 2021-10-04 13:27           ` Quirin Gylstorff
  2021-10-04 13:44           ` Jan Kiszka
  1 sibling, 0 replies; 19+ messages in thread
From: Quirin Gylstorff @ 2021-10-04 13:27 UTC (permalink / raw)
  To: cip-dev, dinesh.kumar, jan.kiszka

[-- Attachment #1: Type: text/plain, Size: 960 bytes --]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Replace the default assignment to ensure the generation of the
swu file. As stated in [1]: If multiple `?=` assignments are used
the first of those assignments ends up getting used.

This fixes [2].

[1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
[2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 kas/opt/swupdate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index 7d86ad5..bd0f6e4 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -19,5 +19,5 @@ local_conf_header:
     IMAGE_INSTALL_append = " swupdate"
 
   wic-swu: |
-    IMAGE_TYPE ?= "wic-swu-img"
+    IMAGE_TYPE = "wic-swu-img"
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
-- 
2.30.2


[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6775): https://lists.cip-project.org/g/cip-dev/message/6775
Mute This Topic: https://lists.cip-project.org/mt/86066250/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [PATCH v2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04 13:27         ` [PATCH v2] " Q. Gylstorff
  2021-10-04 13:27           ` [cip-dev] " Quirin Gylstorff
@ 2021-10-04 13:44           ` Jan Kiszka
  2021-10-04 13:44             ` [cip-dev] " Jan Kiszka
  1 sibling, 1 reply; 19+ messages in thread
From: Jan Kiszka @ 2021-10-04 13:44 UTC (permalink / raw)
  To: Q. Gylstorff, cip-dev, dinesh.kumar

On 04.10.21 15:27, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Replace the default assignment to ensure the generation of the
> swu file. As stated in [1]: If multiple `?=` assignments are used
> the first of those assignments ends up getting used.
> 
> This fixes [2].
> 
> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas/opt/swupdate.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
> index 7d86ad5..bd0f6e4 100644
> --- a/kas/opt/swupdate.yml
> +++ b/kas/opt/swupdate.yml
> @@ -19,5 +19,5 @@ local_conf_header:
>      IMAGE_INSTALL_append = " swupdate"
>  
>    wic-swu: |
> -    IMAGE_TYPE ?= "wic-swu-img"
> +    IMAGE_TYPE = "wic-swu-img"
>      WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> 

Thanks, replaced v1 with this in next.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [cip-dev] [PATCH v2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
  2021-10-04 13:44           ` Jan Kiszka
@ 2021-10-04 13:44             ` Jan Kiszka
  0 siblings, 0 replies; 19+ messages in thread
From: Jan Kiszka @ 2021-10-04 13:44 UTC (permalink / raw)
  To: Q. Gylstorff, cip-dev, dinesh.kumar

[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]

On 04.10.21 15:27, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Replace the default assignment to ensure the generation of the
> swu file. As stated in [1]: If multiple `?=` assignments are used
> the first of those assignments ends up getting used.
> 
> This fixes [2].
> 
> [1]: https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-metadata.html#setting-a-default-value
> [2]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/14
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas/opt/swupdate.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
> index 7d86ad5..bd0f6e4 100644
> --- a/kas/opt/swupdate.yml
> +++ b/kas/opt/swupdate.yml
> @@ -19,5 +19,5 @@ local_conf_header:
>      IMAGE_INSTALL_append = " swupdate"
>  
>    wic-swu: |
> -    IMAGE_TYPE ?= "wic-swu-img"
> +    IMAGE_TYPE = "wic-swu-img"
>      WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> 

Thanks, replaced v1 with this in next.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6777): https://lists.cip-project.org/g/cip-dev/message/6777
Mute This Topic: https://lists.cip-project.org/mt/86066250/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2021-10-04 13:44 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28 18:49 [cip-dev][isar-cip-core][PATCH 0/2] Fix for issue gitlab #14 Quirin Gylstorff
2021-09-28 18:49 ` Q. Gylstorff
2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE Q. Gylstorff
2021-09-28 18:49   ` Quirin Gylstorff
2021-10-04  9:28     ` Jan Kiszka
2021-10-04  9:28       ` Jan Kiszka
2021-10-04 10:37       ` Jan Kiszka
2021-10-04 10:37         ` Jan Kiszka
2021-10-04 12:46         ` Gylstorff Quirin
2021-10-04 12:46           ` Quirin Gylstorff
2021-10-04 13:27         ` [PATCH v2] " Q. Gylstorff
2021-10-04 13:27           ` [cip-dev] " Quirin Gylstorff
2021-10-04 13:44           ` Jan Kiszka
2021-10-04 13:44             ` [cip-dev] " Jan Kiszka
2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE Q. Gylstorff
2021-09-28 18:49   ` Quirin Gylstorff
2021-09-28 22:09     ` Jan Kiszka
2021-09-29  7:53       ` Quirin Gylstorff
2021-09-29  7:53         ` Gylstorff Quirin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).