meta-isar: linux-mainline: Adjust config fragment usage

Message ID 05c13543-490b-4109-98f1-09c8c295c376@siemens.com
State New
Headers show
Series meta-isar: linux-mainline: Adjust config fragment usage | expand

Commit Message

Jan Kiszka March 27, 2026, 4:58 p.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

This tests the new feature for specifying fragments inside unpacked
directories.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Depends on https://patchwork.isar-build.org/project/isar/patch/f8937fee-2491-49ed-9086-7be1f481a60a@siemens.com/

 meta-isar/recipes-kernel/linux/linux-mainline_6.12.58.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_6.12.58.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.12.58.bb
index 3e2877bb..e240b3a9 100644
--- a/meta-isar/recipes-kernel/linux/linux-mainline_6.12.58.bb
+++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.12.58.bb
@@ -13,7 +13,7 @@  SRC_URI += " \
     https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz \
     file://x86_64_defconfig \
     file://ftpm-module.cfg \
-    file://subdir/no-ubifs-fs.cfg \
+    file://subdir \
     file://no-root-nfs.cfg;apply=no"
 
 SRC_URI[sha256sum] = "5f1c4c546660a6a81046fdfa6195306bad2c8d17c0d69876dc100a85ad4613ac"
@@ -24,6 +24,8 @@  KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig"
 
 LINUX_VERSION_EXTENSION = "-isar"
 
+KERNEL_CONFIG_FRAGMENTS = "subdir/no-ubifs-fs.cfg"
+
 check_fragments_applied() {
     grep -q "# CONFIG_MTD is not set" ${S}/debian/rules ||
         cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' ${S}/debian/rules