diff mbox series

[isar-cip-core,8/9] Add Debian trixie

Message ID 9f7d4bfb8372fd290187302c94c455ddf5aafa4c.1730977077.git.jan.kiszka@siemens.com (mailing list archive)
State New
Headers show
Series Enable early Debian trixie support, drop sid | expand

Commit Message

Jan Kiszka Nov. 7, 2024, 10:57 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Comes with an isar revision bump to stop using a self-built
crossbuild-essential-riscv64 package.

Based on similar changes by Cedric Hombourger and Quirin Gylstorff.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Kconfig                                          |  4 ++++
 conf/distro/cip-core-trixie.conf                 | 16 ++++++++++++++++
 kas-cip.yml                                      |  2 +-
 kas/opt/trixie.yml                               | 15 +++++++++++++++
 recipes-devtools/secure-boot-secrets/files/sid   |  1 +
 .../files/{sid => trixie}/PkKek-1-snakeoil.key   |  0
 .../files/{sid => trixie}/PkKek-1-snakeoil.pem   |  0
 .../swupdate-certificates/files/trixie           |  1 +
 start-qemu.sh                                    |  2 ++
 9 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 conf/distro/cip-core-trixie.conf
 create mode 100644 kas/opt/trixie.yml
 create mode 120000 recipes-devtools/secure-boot-secrets/files/sid
 rename recipes-devtools/secure-boot-secrets/files/{sid => trixie}/PkKek-1-snakeoil.key (100%)
 rename recipes-devtools/secure-boot-secrets/files/{sid => trixie}/PkKek-1-snakeoil.pem (100%)
 create mode 120000 recipes-devtools/swupdate-certificates/files/trixie
diff mbox series

Patch

diff --git a/Kconfig b/Kconfig
index d10ae917..09bb7699 100644
--- a/Kconfig
+++ b/Kconfig
@@ -136,6 +136,9 @@  config DEBIAN_BOOKWORM
 	bool "bookworm (12)"
 	depends on !ARCH_RISCV64
 
+config DEBIAN_TRIXIE
+	bool "trixie (testing)"
+
 config DEBIAN_SID
 	bool "sid (unstable)"
 	depends on ARCH_RISCV64
@@ -147,6 +150,7 @@  config KAS_INCLUDE_DEBIAN
 	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/trixie.yml" if DEBIAN_TRIXIE
 	default "kas/opt/sid.yml" if DEBIAN_SID
 
 comment "Image features"
diff --git a/conf/distro/cip-core-trixie.conf b/conf/distro/cip-core-trixie.conf
new file mode 100644
index 00000000..58999d1b
--- /dev/null
+++ b/conf/distro/cip-core-trixie.conf
@@ -0,0 +1,16 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2024
+#
+# Authors:
+#  Cedric Hombourger <cedric.hombourger@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require conf/distro/debian-trixie.conf
+require cip-core-common.inc
+
+PREFERRED_VERSION_linux-cip ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
diff --git a/kas-cip.yml b/kas-cip.yml
index 73c467ed..fcdb10c4 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@  repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: 8c9bdd3cb0ac93aa46552d4554bafaea5d1d7d13
+    commit: 57f6b70d91711075fbeb07dd2bdf5c9e5b3c6ee6
     layers:
       meta:
 
diff --git a/kas/opt/trixie.yml b/kas/opt/trixie.yml
new file mode 100644
index 00000000..e9a76ef5
--- /dev/null
+++ b/kas/opt/trixie.yml
@@ -0,0 +1,15 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2024
+#
+# Authors:
+#  Cedric Hombourger <cedric.hombourger@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 14
+
+distro: cip-core-trixie
diff --git a/recipes-devtools/secure-boot-secrets/files/sid b/recipes-devtools/secure-boot-secrets/files/sid
new file mode 120000
index 00000000..f0b7e328
--- /dev/null
+++ b/recipes-devtools/secure-boot-secrets/files/sid
@@ -0,0 +1 @@ 
+trixie
\ No newline at end of file
diff --git a/recipes-devtools/secure-boot-secrets/files/sid/PkKek-1-snakeoil.key b/recipes-devtools/secure-boot-secrets/files/trixie/PkKek-1-snakeoil.key
similarity index 100%
rename from recipes-devtools/secure-boot-secrets/files/sid/PkKek-1-snakeoil.key
rename to recipes-devtools/secure-boot-secrets/files/trixie/PkKek-1-snakeoil.key
diff --git a/recipes-devtools/secure-boot-secrets/files/sid/PkKek-1-snakeoil.pem b/recipes-devtools/secure-boot-secrets/files/trixie/PkKek-1-snakeoil.pem
similarity index 100%
rename from recipes-devtools/secure-boot-secrets/files/sid/PkKek-1-snakeoil.pem
rename to recipes-devtools/secure-boot-secrets/files/trixie/PkKek-1-snakeoil.pem
diff --git a/recipes-devtools/swupdate-certificates/files/trixie b/recipes-devtools/swupdate-certificates/files/trixie
new file mode 120000
index 00000000..3d633aef
--- /dev/null
+++ b/recipes-devtools/swupdate-certificates/files/trixie
@@ -0,0 +1 @@ 
+../../secure-boot-secrets/files/trixie
\ No newline at end of file
diff --git a/start-qemu.sh b/start-qemu.sh
index 9ec0f1c2..0e425ea7 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -46,6 +46,8 @@  if [ -z "${DISTRO_RELEASE}" ]; then
 		DISTRO_RELEASE="buster"
 	elif grep -s -q "DEBIAN_BOOKWORM: true" .config.yaml; then
 		DISTRO_RELEASE="bookworm"
+	elif grep -s -q "DEBIAN_TRIXIE: true" .config.yaml; then
+		DISTRO_RELEASE="trixie"
 	else
 		DISTRO_RELEASE="bullseye"
 	fi