| Message ID | 20260629094624.855927-7-amikan@ilbers.de |
|---|---|
| State | New |
| Headers | show |
| Series | Add new targets and required fixes | expand |
diff --git a/meta-isar/conf/multiconfig/bananapi-trixie.conf b/meta-isar/conf/multiconfig/bananapi-trixie.conf index c2a9c667..400900b6 100644 --- a/meta-isar/conf/multiconfig/bananapi-trixie.conf +++ b/meta-isar/conf/multiconfig/bananapi-trixie.conf @@ -1,7 +1,10 @@ # This software is a part of Isar. -# Copyright (C) 2025 ilbers GmbH +# Copyright (C) 2025-2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT MACHINE ?= "bananapi" DISTRO ?= "debian-trixie" -IMAGE_INSTALL += "initramfs-trixie-armhf-hook" +# Workaround for missing drivers +IMAGE_INSTALL += "initramfs-sunxi-mmc-hook" diff --git a/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf b/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf index ee53e68d..e283c635 100644 --- a/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf +++ b/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf @@ -1,7 +1,11 @@ -# This software is a part of ISAR. +# This software is a part of Isar. # Copyright (C) 2025 Siemens AG +# Copyright (C) 2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT MACHINE ?= "nanopi-neo" DISTRO ?= "debian-trixie" -IMAGE_INSTALL += "initramfs-trixie-armhf-hook" +# Workaround for missing drivers +IMAGE_INSTALL += "initramfs-sunxi-mmc-hook" diff --git a/meta-isar/conf/multiconfig/qemuarm-trixie.conf b/meta-isar/conf/multiconfig/qemuarm-trixie.conf index 5ec903a5..ba93774c 100644 --- a/meta-isar/conf/multiconfig/qemuarm-trixie.conf +++ b/meta-isar/conf/multiconfig/qemuarm-trixie.conf @@ -6,4 +6,5 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-trixie" -IMAGE_INSTALL += "initramfs-trixie-armhf-hook" +# Workaround for missing drivers +IMAGE_INSTALL += "initramfs-virtio-blk-hook" diff --git a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-trixie-armhf-hook_0.1.bb b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-missing-hook.inc similarity index 92% rename from meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-trixie-armhf-hook_0.1.bb rename to meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-missing-hook.inc index b0e4e697..2b15f1ee 100644 --- a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-trixie-armhf-hook_0.1.bb +++ b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-missing-hook.inc @@ -58,6 +58,6 @@ inherit initramfs-hook # initramfs-tools. # ----------------------------------------------------------------------------- -HOOK_ADD_MODULES:append:qemuarm:debian-trixie = "virtio-blk" -HOOK_ADD_MODULES:append:bananapi:debian-trixie = "sunxi_mmc" -HOOK_ADD_MODULES:append:nanopi-neo:debian-trixie = "sunxi_mmc" +MISSING_DRIVER ?= "" + +HOOK_ADD_MODULES:append = "${MISSING_DRIVER}" diff --git a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb new file mode 100644 index 00000000..afcc2cca --- /dev/null +++ b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +require initramfs-missing-hook.inc + +MISSING_DRIVER = "sunxi_mmc" diff --git a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb new file mode 100644 index 00000000..1d6d48f1 --- /dev/null +++ b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +require initramfs-missing-hook.inc + +MISSING_DRIVER = "virtio_blk"
Because missing driver is different for different machines, recipe metadata is also different. It results in running several instances of the recipe build in the same workdir for multiconfig setup. Split it into 2 separate recipes with different names (and workdirs). Fixes: f4cbcd7b ("trixie: Workaround with missing drivers in initramfs") Signed-off-by: Anton Mikanovich <amikan@ilbers.de> --- meta-isar/conf/multiconfig/bananapi-trixie.conf | 7 +++++-- meta-isar/conf/multiconfig/nanopi-neo-trixie.conf | 8 ++++++-- meta-isar/conf/multiconfig/qemuarm-trixie.conf | 3 ++- ...rixie-armhf-hook_0.1.bb => initramfs-missing-hook.inc} | 6 +++--- .../initramfs-sunxi-mmc-hook_0.2.bb | 8 ++++++++ .../initramfs-virtio-blk-hook_0.2.bb | 8 ++++++++ 6 files changed, 32 insertions(+), 8 deletions(-) rename meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/{initramfs-trixie-armhf-hook_0.1.bb => initramfs-missing-hook.inc} (92%) create mode 100644 meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb create mode 100644 meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb