cip-dev.lists.cip-project.org archive mirror
 help / color / mirror / Atom feed
From: Gylstorff Quirin <quirin.gylstorff@siemens.com>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: "dinesh.kumar@toshiba-tsip.com" <dinesh.kumar@toshiba-tsip.com>,
	"cip-dev@lists.cip-project.org" <cip-dev@lists.cip-project.org>
Subject: Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
Date: Mon, 4 Oct 2021 14:46:02 +0200	[thread overview]
Message-ID: <38973f2f-7d8f-65c5-b6f1-257732618292@siemens.com> (raw)
In-Reply-To: <be00776f-c1c5-9c84-c904-2d8e17cc298d@siemens.com>



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
> 






WARNING: multiple messages have this Message-ID
From: "Quirin Gylstorff" <quirin.gylstorff@siemens.com>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: "dinesh.kumar@toshiba-tsip.com" <dinesh.kumar@toshiba-tsip.com>,
	"cip-dev@lists.cip-project.org" <cip-dev@lists.cip-project.org>
Subject: Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE
Date: Mon, 4 Oct 2021 14:46:02 +0200	[thread overview]
Message-ID: <38973f2f-7d8f-65c5-b6f1-257732618292@siemens.com> (raw)
Message-ID: <20211004124602.39BZPOM8oM8lmou2q3JbLZmt3JzhTFnGwYQ46MOsOMI@z> (raw)
In-Reply-To: <be00776f-c1c5-9c84-c904-2d8e17cc298d@siemens.com>

[-- 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]
-=-=-=-=-=-=-=-=-=-=-=-


  parent reply	other threads:[~2021-10-04 12:46 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=38973f2f-7d8f-65c5-b6f1-257732618292@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=dinesh.kumar@toshiba-tsip.com \
    --cc=jan.kiszka@siemens.com \
    --subject='Re: [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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