From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v2 06/11] trixie: Split missing drivers hook recipes
Date: Mon, 29 Jun 2026 12:46:19 +0300 [thread overview]
Message-ID: <20260629094624.855927-7-amikan@ilbers.de> (raw)
In-Reply-To: <20260629094624.855927-1-amikan@ilbers.de>
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
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"
--
2.34.1
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260629094624.855927-7-amikan%40ilbers.de.
next prev parent reply other threads:[~2026-06-29 9:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-29 9:46 [PATCH v2 00/11] Add new targets and required fixes Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 01/11] grub: Remove obsolete efi_uga module for new distros Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 02/11] CI: Freeze setuptools package version for avocado compatibility Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 03/11] CI: Fix errors reporting during startvm Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 04/11] meta: Add base distro overrides Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 05/11] linux-kernel: Reverse linux-libc-dev package arch selection logic Anton Mikanovich
2026-06-29 9:46 ` Anton Mikanovich [this message]
2026-06-29 9:46 ` [PATCH v2 07/11] CI: Move trixie targets to generic test cases Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 08/11] CI: Run startvm for all qemu targets Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 09/11] meta: Add Ubuntu 26.04 (Resolute Raccoon) support Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 10/11] testsuite: Cover Debian Trixie RISCV64 QEMU target with CI Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 11/11] testsuite: Cover Debian Forky " Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260629094624.855927-7-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox