[cip-dev][isar-cip-core][PATCH 0/5] Add ci for secure-boot and swupdate

[cip-dev][isar-cip-core][PATCH 0/5] Add ci for secure-boot and swupdate

[Quirin Gylstorff]

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

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

Add the following ci builds:
 - qemu-amd64 ebg-secure-boot-snakeoil
 - qemu-amd64 ebg-swu (efibootguard + swupdate)
 - qemu-amd65 ebg-snakeoil-swu (efibootguard + secure-boot + swupdate)

This patch set also fixes issues for these ci builds.

Quirin Gylstorff (5):
  swupdate-config: add dependency to u-boot-${MACHINE}-config
  kas/opt: Allow override of WKS_FILE in swupdate option
  .gitlabci.yml: add secureboot build
  .gitlabci.yml: add swupdate build
  .gitlabci.yml: Add secure-boot and swupdate build

 .gitlab-ci.yml                  | 33 +++++++++++++++++++++++++++++++++
 classes/swupdate-config.bbclass |  4 +++-
 kas/opt/ebg-snakeoil-swu.yml    | 17 +++++++++++++++++
 kas/opt/ebg-swu.yml             | 16 ++++++++++++++++
 kas/opt/efibootguard.yml        |  2 ++
 kas/opt/swupdate.yml            |  4 ++--
 6 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 kas/opt/ebg-snakeoil-swu.yml
 create mode 100644 kas/opt/ebg-swu.yml

-- 
2.20.1


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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6473): https://lists.cip-project.org/g/cip-dev/message/6473
Mute This Topic: https://lists.cip-project.org/mt/83123858/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]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH 1/5] swupdate-config: add dependency to u-boot-${MACHINE}-config

[Quirin Gylstorff]

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

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

If U_BOOT_CONFIG_PACKAGE is set,  swupdate should depend on
the u-boot-${MACHINE}-config.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 classes/swupdate-config.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 4e46b37..f67ca4f 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -54,7 +54,9 @@ KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
 KFEATURE_u-boot[DEBIAN_DEPENDS] = "${@ 'libubootenv0.1, u-boot-${MACHINE}-config' \
                                           if d.getVar("U_BOOT_CONFIG_PACKAGE", True) == "1" \
                                           else 'libubootenv0.1'}"
-KFEATURE_u-boot[DEPENDS] = "libubootenv"
+KFEATURE_u-boot[DEPENDS] = "${@ 'libubootenv u-boot-${MACHINE}-config' \
+                                          if d.getVar("U_BOOT_CONFIG_PACKAGE", True) == "1" \
+                                          else 'libubootenv'}"
 KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"
 
 SWUPDATE_LUASCRIPT ?= "swupdate_handlers.lua"
-- 
2.20.1


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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6478): https://lists.cip-project.org/g/cip-dev/message/6478
Mute This Topic: https://lists.cip-project.org/mt/83124076/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]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH 2/5] kas/opt: Allow override of WKS_FILE in swupdate option

[Quirin Gylstorff]

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

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

This fixes an error if swupdate.yml is used together with
the secureboot options.

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

diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index 544c740..d5a0e39 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -23,4 +23,6 @@ local_conf_header:
   efibootguard-wic: |
     WDOG_TIMEOUT = "0"
     WICVARS += "WDOG_TIMEOUT"
+    IMAGE_TYPE ?= "wic-img"
+    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
 
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index e622972..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"
-    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
+    IMAGE_TYPE = "wic-swu-img"
+    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
-- 
2.20.1


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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6475): https://lists.cip-project.org/g/cip-dev/message/6475
Mute This Topic: https://lists.cip-project.org/mt/83123996/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]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH 3/5] .gitlabci.yml: add secureboot build

[Quirin Gylstorff]

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

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

Avoid build errors due to changes in the secure boot configuration.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84c1257..2bfed93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,3 +151,15 @@ build:qemu-arm-test:
     extention: test
     wic_targz: disable
     targz: enable
+
+build:qemu-amd64-secure-boot:
+  extends:
+    - .build_base
+  variables:
+    target: qemu-amd64
+    extention: ebg-secure-boot-snakeoil
+    use_rt: disable
+    wic_targz: disable
+    targz: disable
+    deploy: disable
+
-- 
2.20.1


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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6476): https://lists.cip-project.org/g/cip-dev/message/6476
Mute This Topic: https://lists.cip-project.org/mt/83123998/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]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH 4/5] .gitlabci.yml: add swupdate build

[Quirin Gylstorff]

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

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

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml      | 10 ++++++++++
 kas/opt/ebg-swu.yml | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 kas/opt/ebg-swu.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bfed93..44ade3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,3 +163,13 @@ build:qemu-amd64-secure-boot:
     targz: disable
     deploy: disable
 
+build:qemu-amd64-swupdate:
+  extends:
+    - .build_base
+  variables:
+    target: qemu-amd64
+    extention: ebg-swu
+    use_rt: disable
+    wic_targz: disable
+    targz: disable
+    deploy: disable
diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
new file mode 100644
index 0000000..8c56182
--- /dev/null
+++ b/kas/opt/ebg-swu.yml
@@ -0,0 +1,16 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+  includes:
+   - efibootguard.yml
+   - swupdate.yml
-- 
2.20.1


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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6474): https://lists.cip-project.org/g/cip-dev/message/6474
Mute This Topic: https://lists.cip-project.org/mt/83123859/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]
-=-=-=-=-=-=-=-=-=-=-=-

[cip-dev][isar-cip-core][PATCH 5/5] .gitlabci.yml: Add secure-boot and swupdate build

[Quirin Gylstorff]

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

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

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml               | 11 +++++++++++
 kas/opt/ebg-snakeoil-swu.yml | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 kas/opt/ebg-snakeoil-swu.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44ade3e..9d9ced0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,3 +173,14 @@ build:qemu-amd64-swupdate:
     wic_targz: disable
     targz: disable
     deploy: disable
+
+build:qemu-amd64-secure-boot-swu:
+  extends:
+    - .build_base
+  variables:
+    target: qemu-amd64
+    extention: ebg-snakeoil-swu
+    use_rt: disable
+    wic_targz: disable
+    targz: disable
+    deploy: disable
diff --git a/kas/opt/ebg-snakeoil-swu.yml b/kas/opt/ebg-snakeoil-swu.yml
new file mode 100644
index 0000000..e4dd98f
--- /dev/null
+++ b/kas/opt/ebg-snakeoil-swu.yml
@@ -0,0 +1,17 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 10
+  includes:
+   - ebg-secure-boot-snakeoil.yml
+   - swupdate.yml
+
-- 
2.20.1


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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6477): https://lists.cip-project.org/g/cip-dev/message/6477
Mute This Topic: https://lists.cip-project.org/mt/83124000/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]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [cip-dev][isar-cip-core][PATCH 2/5] kas/opt: Allow override of WKS_FILE in swupdate option

[Jan Kiszka]

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

On 27.05.21 15:17, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> This fixes an error if swupdate.yml is used together with
> the secureboot options.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  kas/opt/efibootguard.yml | 2 ++
>  kas/opt/swupdate.yml     | 4 ++--
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
> index 544c740..d5a0e39 100644
> --- a/kas/opt/efibootguard.yml
> +++ b/kas/opt/efibootguard.yml
> @@ -23,4 +23,6 @@ local_conf_header:
>    efibootguard-wic: |
>      WDOG_TIMEOUT = "0"
>      WICVARS += "WDOG_TIMEOUT"
> +    IMAGE_TYPE ?= "wic-img"
> +    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
>  
> diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
> index e622972..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"
> -    WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> +    IMAGE_TYPE = "wic-swu-img"

Why no weak assignment here but above?

Jan

> +    WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
> 


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

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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6483): https://lists.cip-project.org/g/cip-dev/message/6483
Mute This Topic: https://lists.cip-project.org/mt/83123996/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]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [cip-dev][isar-cip-core][PATCH 0/5] Add ci for secure-boot and swupdate

[Jan Kiszka]

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

On 27.05.21 15:17, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Add the following ci builds:
>  - qemu-amd64 ebg-secure-boot-snakeoil
>  - qemu-amd64 ebg-swu (efibootguard + swupdate)
>  - qemu-amd65 ebg-snakeoil-swu (efibootguard + secure-boot + swupdate)
> 
> This patch set also fixes issues for these ci builds.
> 
> Quirin Gylstorff (5):
>   swupdate-config: add dependency to u-boot-${MACHINE}-config
>   kas/opt: Allow override of WKS_FILE in swupdate option
>   .gitlabci.yml: add secureboot build
>   .gitlabci.yml: add swupdate build
>   .gitlabci.yml: Add secure-boot and swupdate build
> 
>  .gitlab-ci.yml                  | 33 +++++++++++++++++++++++++++++++++
>  classes/swupdate-config.bbclass |  4 +++-
>  kas/opt/ebg-snakeoil-swu.yml    | 17 +++++++++++++++++
>  kas/opt/ebg-swu.yml             | 16 ++++++++++++++++
>  kas/opt/efibootguard.yml        |  2 ++
>  kas/opt/swupdate.yml            |  4 ++--
>  6 files changed, 73 insertions(+), 3 deletions(-)
>  create mode 100644 kas/opt/ebg-snakeoil-swu.yml
>  create mode 100644 kas/opt/ebg-swu.yml
> 

Thanks, applied to next, with weak IMAGE_TYPE in patch 2 (complain if
that is not appropriate).

Jan

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

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


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6484): https://lists.cip-project.org/g/cip-dev/message/6484
Mute This Topic: https://lists.cip-project.org/mt/83123858/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]
-=-=-=-=-=-=-=-=-=-=-=-