Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE

[Jan Kiszka <jan.kiszka@siemens.com>]

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