mbox series

[isar-cip-core,v4,0/2] swupdate-config: variables cleanup

Message ID 20210505082158.18899-1-Quirin.Gylstorff@siemens.com (mailing list archive)
Headers show
Series swupdate-config: variables cleanup | expand

Message

Quirin Gylstorff May 5, 2021, 8:21 a.m. UTC
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This patch removes the variable U_BOOT from the swupdate-config.bbclass.
It also adds the suffix `SWUPDATE` to the variable BOOTLOADER.

If a custom u-boot is used in concunction with swupdate it is
recommened to set `U_BOOT_CONFIG_PACKAGE` to '1'. This now adds
a dependency from SWupdate to u-boot-{MACHINE}-config for installing
fw_env.config.

Changes in V2:
 - fix typo in commit message
 - use variable in kas/opt/*.yml

Changes in V3:
 - remove variable U_BOOT
 - split into 2 commits

Changes in V4:
 - Add missing Changes log
 - Correct commit message

Quirin Gylstorff (2):
  swupdate-config: remove variable U_BOOT
  swupdate-config: add prefix to variable BOOTLOADER

 classes/swupdate-config.bbclass      | 17 ++++++++++-------
 kas/opt/ebg-secure-boot-snakeoil.yml |  2 +-
 kas/opt/ebg-swu.yml                  |  4 ++--
 kas/opt/qemu-swupdate.yml            |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

Comments

Jan Kiszka May 5, 2021, 4:43 p.m. UTC | #1
On 05.05.21 10:21, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> This patch removes the variable U_BOOT from the swupdate-config.bbclass.
> It also adds the suffix `SWUPDATE` to the variable BOOTLOADER.
> 
> If a custom u-boot is used in concunction with swupdate it is
> recommened to set `U_BOOT_CONFIG_PACKAGE` to '1'. This now adds
> a dependency from SWupdate to u-boot-{MACHINE}-config for installing
> fw_env.config.
> 
> Changes in V2:
>  - fix typo in commit message
>  - use variable in kas/opt/*.yml
> 
> Changes in V3:
>  - remove variable U_BOOT
>  - split into 2 commits
> 
> Changes in V4:
>  - Add missing Changes log
>  - Correct commit message
> 
> Quirin Gylstorff (2):
>   swupdate-config: remove variable U_BOOT
>   swupdate-config: add prefix to variable BOOTLOADER
> 
>  classes/swupdate-config.bbclass      | 17 ++++++++++-------
>  kas/opt/ebg-secure-boot-snakeoil.yml |  2 +-
>  kas/opt/ebg-swu.yml                  |  4 ++--
>  kas/opt/qemu-swupdate.yml            |  2 +-
>  4 files changed, 14 insertions(+), 11 deletions(-)
> 

Thanks, applied to next.

We may eventually also want to do a renaming of qemu-swupdate.yml to
qemu-amd64-swupdate.yml - just for the case that there will also be ARM
qemu target to demonstrate/test swupdate.

Jan
Quirin Gylstorff May 6, 2021, 2:12 p.m. UTC | #2
On 5/5/21 6:43 PM, Jan Kiszka wrote:
> On 05.05.21 10:21, Q. Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> This patch removes the variable U_BOOT from the swupdate-config.bbclass.
>> It also adds the suffix `SWUPDATE` to the variable BOOTLOADER.
>>
>> If a custom u-boot is used in concunction with swupdate it is
>> recommened to set `U_BOOT_CONFIG_PACKAGE` to '1'. This now adds
>> a dependency from SWupdate to u-boot-{MACHINE}-config for installing
>> fw_env.config.
>>
>> Changes in V2:
>>   - fix typo in commit message
>>   - use variable in kas/opt/*.yml
>>
>> Changes in V3:
>>   - remove variable U_BOOT
>>   - split into 2 commits
>>
>> Changes in V4:
>>   - Add missing Changes log
>>   - Correct commit message
>>
>> Quirin Gylstorff (2):
>>    swupdate-config: remove variable U_BOOT
>>    swupdate-config: add prefix to variable BOOTLOADER
>>
>>   classes/swupdate-config.bbclass      | 17 ++++++++++-------
>>   kas/opt/ebg-secure-boot-snakeoil.yml |  2 +-
>>   kas/opt/ebg-swu.yml                  |  4 ++--
>>   kas/opt/qemu-swupdate.yml            |  2 +-
>>   4 files changed, 14 insertions(+), 11 deletions(-)
>>
> 
> Thanks, applied to next.
> 
> We may eventually also want to do a renaming of qemu-swupdate.yml to
> qemu-amd64-swupdate.yml - just for the case that there will also be ARM
> qemu target to demonstrate/test swupdate.

Alternative would be to change
`
-WKS_FILE = "qemu-amd64-${SWUPDATE_BOOTLOADER}.wks"
+WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
`
Quirin
> 
> Jan
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6435): https://lists.cip-project.org/g/cip-dev/message/6435
Mute This Topic: https://lists.cip-project.org/mt/82599604/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jan Kiszka May 6, 2021, 2:52 p.m. UTC | #3
On 06.05.21 16:12, Gylstorff Quirin wrote:
> 
> 
> On 5/5/21 6:43 PM, Jan Kiszka wrote:
>> On 05.05.21 10:21, Q. Gylstorff wrote:
>>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>>
>>> This patch removes the variable U_BOOT from the swupdate-config.bbclass.
>>> It also adds the suffix `SWUPDATE` to the variable BOOTLOADER.
>>>
>>> If a custom u-boot is used in concunction with swupdate it is
>>> recommened to set `U_BOOT_CONFIG_PACKAGE` to '1'. This now adds
>>> a dependency from SWupdate to u-boot-{MACHINE}-config for installing
>>> fw_env.config.
>>>
>>> Changes in V2:
>>>   - fix typo in commit message
>>>   - use variable in kas/opt/*.yml
>>>
>>> Changes in V3:
>>>   - remove variable U_BOOT
>>>   - split into 2 commits
>>>
>>> Changes in V4:
>>>   - Add missing Changes log
>>>   - Correct commit message
>>>
>>> Quirin Gylstorff (2):
>>>    swupdate-config: remove variable U_BOOT
>>>    swupdate-config: add prefix to variable BOOTLOADER
>>>
>>>   classes/swupdate-config.bbclass      | 17 ++++++++++-------
>>>   kas/opt/ebg-secure-boot-snakeoil.yml |  2 +-
>>>   kas/opt/ebg-swu.yml                  |  4 ++--
>>>   kas/opt/qemu-swupdate.yml            |  2 +-
>>>   4 files changed, 14 insertions(+), 11 deletions(-)
>>>
>>
>> Thanks, applied to next.
>>
>> We may eventually also want to do a renaming of qemu-swupdate.yml to
>> qemu-amd64-swupdate.yml - just for the case that there will also be ARM
>> qemu target to demonstrate/test swupdate.
> 
> Alternative would be to change
> `
> -WKS_FILE = "qemu-amd64-${SWUPDATE_BOOTLOADER}.wks"
> +WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> `

Right, that file is only an option file anyway.

Jan