1. Cip-Dev
  2. Topics

[isar-cip-core][PATCH v2] Enable Images based on Debian 12 (bookworm)

Quirin Gylstorff
 

On 2/2/23 17:00, Jan Kiszka wrote:
On 02.02.23 16:11, Florian Bezdeka wrote:
On Thu, 2023-02-02 at 16:08 +0100, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>

This will add prelimitary support for the debian 12 aka bookworm.
Following the Isar mailing list I will expect some trouble now. The apt
keys fpr bookworm part of Isar expired... Fixes are available but would
force isar-cip-core to migrate to bitbake 2.0.

Let's wait for some build and test results and see.
And there might be also a fix for the firmware topic coming, see Felix'
patch. Then we can keep the hihope.
We will see https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/765666637

Quirin
Jan


Best regards,
Florian


Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...>
---
Changes v2:
- Adjusted blank lines
- Change Submit subject from "Add bookworm" to "Enable Images based on Debian 12 (bookworm)"
- Replaced "+=" with "=" if append was used
- drop pinned kernel for qemu-amd64 secureboot
- drop Hihope build as firmware-ti-connectivity is not available for bookworm
Jan Kiszka
 

On 02.02.23 16:11, Florian Bezdeka wrote:
On Thu, 2023-02-02 at 16:08 +0100, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>

This will add prelimitary support for the debian 12 aka bookworm.
Following the Isar mailing list I will expect some trouble now. The apt
keys fpr bookworm part of Isar expired... Fixes are available but would
force isar-cip-core to migrate to bitbake 2.0.

Let's wait for some build and test results and see.
And there might be also a fix for the firmware topic coming, see Felix'
patch. Then we can keep the hihope.

Jan


Best regards,
Florian


Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...>
---
Changes v2:
- Adjusted blank lines
- Change Submit subject from "Add bookworm" to "Enable Images based on Debian 12 (bookworm)"
- Replaced "+=" with "=" if append was used
- drop pinned kernel for qemu-amd64 secureboot
- drop Hihope build as firmware-ti-connectivity is not available for bookworm
--
Siemens AG, Technology
Competence Center Embedded Linux
Florian Bezdeka
 

On Thu, 2023-02-02 at 16:08 +0100, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>

This will add prelimitary support for the debian 12 aka bookworm.
Following the Isar mailing list I will expect some trouble now. The apt
keys fpr bookworm part of Isar expired... Fixes are available but would
force isar-cip-core to migrate to bitbake 2.0.

Let's wait for some build and test results and see.

Best regards,
Florian


Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...>
---
Changes v2:
- Adjusted blank lines
- Change Submit subject from "Add bookworm" to "Enable Images based on Debian 12 (bookworm)"
- Replaced "+=" with "=" if append was used
- drop pinned kernel for qemu-amd64 secureboot
- drop Hihope build as firmware-ti-connectivity is not available for bookworm
Quirin Gylstorff
 

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

This will add prelimitary support for the debian 12 aka bookworm.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...>
---
Changes v2:
- Adjusted blank lines
- Change Submit subject from "Add bookworm" to "Enable Images based on Debian 12 (bookworm)"
- Replaced "+=" with "=" if append was used
- drop pinned kernel for qemu-amd64 secureboot
- drop Hihope build as firmware-ti-connectivity is not available for bookworm

.gitlab-ci.yml | 37 ++++++++++++++++++++++++++++
Kconfig | 5 ++++
conf/distro/cip-core-bookworm.conf | 17 +++++++++++++
kas/opt/bookworm.yml | 15 +++++++++++
recipes-core/images/efibootguard.inc | 6 ++++-
recipes-core/images/swupdate.inc | 6 ++++-
6 files changed, 84 insertions(+), 2 deletions(-)
create mode 100644 conf/distro/cip-core-bookworm.conf
create mode 100644 kas/opt/bookworm.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7c8c88..4c4796b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ default:
- if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi
- if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi
- if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi
+ - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi
- echo "Building ${base_yaml}"
- kas build ${base_yaml}
- if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
@@ -281,3 +282,39 @@ build:qemu-amd64-secure-boot-buster:
use_rt: disable
wic_targz: disable
deploy: disable
+
+# bookworm images
+build:simatic-ipc227e-bookworm:
+ extends:
+ - .build_base
+ variables:
+ target: simatic-ipc227e
+ release: bookworm
+
+build:bbb-bookworm:
+ extends:
+ - .build_base
+ variables:
+ target: bbb
+ dtb: am335x-boneblack.dtb
+ release: bookworm
+
+build:iwg20m-bookworm:
+ extends:
+ - .build_base
+ variables:
+ target: iwg20m
+ dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
+ release: bookworm
+
+build:qemu-amd64-secure-boot-bookworm:
+ extends:
+ - .build_base
+ variables:
+ base_yaml: "kas-cip.yml:kas/board/${target}.yml"
+ release: bookworm
+ target: qemu-amd64
+ extension: ebg-secure-boot-snakeoil
+ use_rt: disable
+ wic_targz: disable
+ deploy: disable
diff --git a/Kconfig b/Kconfig
index cd24ce2..87056b9 100644
--- a/Kconfig
+++ b/Kconfig
@@ -128,6 +128,10 @@ config DEBIAN_BULLSEYE
bool "bullseye (11)"
depends on !ARCH_RISCV64

+config DEBIAN_BOOKWORM
+ bool "bookworm (12)"
+ depends on !ARCH_RISCV64
+
config DEBIAN_SID_PORTS
bool "sid (unstable) with unofficial ports"
depends on ARCH_RISCV64
@@ -138,6 +142,7 @@ config KAS_INCLUDE_DEBIAN
string
default "kas/opt/buster.yml" if DEBIAN_BUSTER
default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE
+ default "kas/opt/bookworm.yml" if DEBIAN_BOOKWORM
default "kas/opt/sid-ports.yml" if DEBIAN_SID_PORTS

comment "Image features"
diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
new file mode 100644
index 0000000..86c97a1
--- /dev/null
+++ b/conf/distro/cip-core-bookworm.conf
@@ -0,0 +1,17 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Quirin Gylstorff <quirin.gylstorff@...>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require conf/distro/debian-bookworm.conf
+require cip-core-common.inc
+
+PREFERRED_VERSION_efibootguard ?= "0.13.%"
+PREFERRED_VERSION_linux-cip ?= "5.10.%"
+PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
diff --git a/kas/opt/bookworm.yml b/kas/opt/bookworm.yml
new file mode 100644
index 0000000..8b4431b
--- /dev/null
+++ b/kas/opt/bookworm.yml
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Quirin Gylstorff <quirin.gylstorff@...>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 12
+
+distro: cip-core-bookworm
diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
index eace4fd..29444f6 100644
--- a/recipes-core/images/efibootguard.inc
+++ b/recipes-core/images/efibootguard.inc
@@ -9,7 +9,11 @@
# SPDX-License-Identifier: MIT
#

-IMAGE_INSTALL_append = " efibootguard"
+OVERRIDES_append = ":${BASE_DISTRO_CODENAME}"
+
+IMAGE_PREINSTALL_append_bookworm = " efibootguard"
+IMAGE_INSTALL_append_bullseye = " efibootguard"
+IMAGE_INSTALL_append_buster = " efibootguard"

WIC_IMAGER_INSTALL_append = " efibootguard"
WDOG_TIMEOUT ?= "60"
diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index 9b2aedc..f3f24a8 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -13,7 +13,11 @@ inherit image_uuid
inherit swupdate
inherit read-only-rootfs

-IMAGE_INSTALL += " swupdate"
+OVERRIDES_append = ":${BASE_DISTRO_CODENAME}"
+
+IMAGE_PREINSTALL_append_bookworm = " swupdate"
+IMAGE_INSTALL_append_bullseye = " swupdate"
+IMAGE_INSTALL_append_buster = " swupdate"
IMAGE_INSTALL += " swupdate-handler-roundrobin"

ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.p4.gz"
--
2.39.1

1 - 4 of 4