[isar-cip-core][PATCH v4 2/3] Enable Debian Sid support
Shivanand Kunijadar <[email protected]>
| Newsgroups | org.cip-project.lists.cip-dev |
|---|---|
| Message-ID | <[email protected]> |
This patch enables to build the images based on the Debian sid version. It helps to fix the issues in advance for the newer version. Signed-off-by: Shivanand Kunijadar <[email protected]> --- Kconfig | 4 ++++ conf/distro/cip-core-sid.conf | 13 +++++++++++++ kas/opt/sid.yml | 15 +++++++++++++++ .../initramfs-crypt-hook_0.11.bb | 2 ++ start-qemu.sh | 2 ++ 5 files changed, 36 insertions(+) create mode 100644 conf/distro/cip-core-sid.conf create mode 100644 kas/opt/sid.yml diff --git a/Kconfig b/Kconfig index bd2b7ce..44f2337 100644 --- a/Kconfig +++ b/Kconfig @@ -239,6 +239,9 @@ config DEBIAN_BOOKWORM config DEBIAN_TRIXIE bool "trixie (13)" +config DEBIAN_SID + bool "Sid (Unstable)" + endchoice config KAS_INCLUDE_DEBIAN @@ -247,6 +250,7 @@ config KAS_INCLUDE_DEBIAN 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-sid.conf b/conf/distro/cip-core-sid.conf new file mode 100644 index 0000000..2f6eb69 --- /dev/null +++ b/conf/distro/cip-core-sid.conf @@ -0,0 +1,13 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2024-2025 +# +# Authors: +# Cedric Hombourger <[email protected]> +# +# SPDX-License-Identifier: MIT +# + +require conf/distro/debian-sid.conf +require cip-core-common.inc diff --git a/kas/opt/sid.yml b/kas/opt/sid.yml new file mode 100644 index 0000000..d5dce00 --- /dev/null +++ b/kas/opt/sid.yml @@ -0,0 +1,15 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2024 +# +# Authors: +# Cedric Hombourger <[email protected]> +# +# SPDX-License-Identifier: MIT +# + +header: + version: 14 + +distro: cip-core-sid diff --git a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.11.bb b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.11.bb index 3cb0520..9132ad3 100644 --- a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.11.bb +++ b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.11.bb @@ -38,9 +38,11 @@ DEBIAN_DEPENDS:append:buster = ", libgcc-7-dev, libtss2-esys0" DEBIAN_DEPENDS:append:bullseye = ", libtss2-esys-3.0.2-0, libtss2-rc0, libtss2-mu0" DEBIAN_DEPENDS:append:bookworm = ", libtss2-esys-3.0.2-0, libtss2-rc0, libtss2-mu0" DEBIAN_DEPENDS:append:trixie = ", libtss2-esys-3.0.2-0t64, libtss2-rc0t64, libtss2-mu-4.0.1-0t64" +DEBIAN_DEPENDS:append:sid = ", libtss2-esys-3.0.2-0t64, libtss2-rc0t64, libtss2-mu-4.0.1-0t64" DEBIAN_DEPENDS:append:clevis = ", clevis-luks, jose, bash, luksmeta, file, libpwquality-tools, clevis-tpm2" DEBIAN_DEPENDS:append:systemd:trixie = ", systemd-cryptsetup" +DEBIAN_DEPENDS:append:systemd:sid = ", systemd-cryptsetup" DEBIAN_DEPENDS:append:systemd = ", systemd (>= 251)" HOOK_ADD_MODULES = " \ diff --git a/start-qemu.sh b/start-qemu.sh index 7ccbefe..d12fa23 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -45,6 +45,8 @@ if [ -z "${DISTRO_RELEASE}" ]; then DISTRO_RELEASE="bookworm" elif grep -s -q "DEBIAN_TRIXIE: true" .config.yaml; then DISTRO_RELEASE="trixie" + elif grep -s -q "DEBIAN_SID: true" .config.yaml; then + DISTRO_RELEASE="sid" else echo "No supported Debian release configured" exit 1 -- 2.39.5