public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible
@ 2026-03-23  7:03 'Jan Kiszka' via isar-users
  2026-03-25 15:22 ` Zhihang Wei
  2026-04-01 15:43 ` [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible Zhihang Wei
  0 siblings, 2 replies; 5+ messages in thread
From: 'Jan Kiszka' via isar-users @ 2026-03-23  7:03 UTC (permalink / raw)
  To: isar-users

From: Jan Kiszka <jan.kiszka@siemens.com>

This allows to add kernel config fragments from other sources than just
individual files in SRC_URI.

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

isar-cip-core will first use this, currently externalizing part of its 
in-tree fragments to the cip-kernel-config repo.

 RECIPE-API-CHANGELOG.md                       |  9 +++++
 meta/classes-recipe/linux-kernel.bbclass      | 37 ++++++++++++-------
 .../linux/files/debian/isar/configure.tmpl    |  2 +-
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index e44b4b9d..2eff4fc3 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -972,3 +972,12 @@ we introduce the variables ``MMAPTOPT_NOEXPKEYSIGN`` and ``DISTRO_MM_OPTS``.
 While the former provides an argument to disable the key expiry checking, the
 latter allows users to inject custom options into ``mmdebstrap``. For details,
 see ``man mmdebstrap``. Use with care!
+
+### Provide additional fragments via KERNEL_CONFIG_FRAGMENTS
+
+Custom kernel builds can now inject config fragments into the build which were
+not provided via individual SRC_URI entries. If a kernel source tree contains a
+fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to
+`KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as
+part of a repository, a tarball, or some other directory structure, just
+specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`.
diff --git a/meta/classes-recipe/linux-kernel.bbclass b/meta/classes-recipe/linux-kernel.bbclass
index 6e383408..9429996f 100644
--- a/meta/classes-recipe/linux-kernel.bbclass
+++ b/meta/classes-recipe/linux-kernel.bbclass
@@ -83,7 +83,7 @@ TEMPLATE_VARS += "                \
     KERNEL_LIBC_DEV_ARCH          \
     LINUX_VERSION_EXTENSION       \
     KERNEL_NAME_PROVIDED          \
-    KERNEL_CONFIG_FRAGMENTS       \
+    KCONFIG_FRAGMENTS             \
     KCFLAGS                       \
     KAFLAGS                       \
     DISTRIBUTOR                   \
@@ -214,8 +214,10 @@ KERNEL_ARCH ??= "${@get_kernel_arch(d)}"
 # set KERNEL_FILE without depending on package arch used in bitbake.conf
 KERNEL_FILE:forcevariable = "${@ 'vmlinux' if d.getVar('KERNEL_ARCH') in ['mipsel', 'riscv', 'arm64'] else 'vmlinuz'}"
 
+KERNEL_CONFIG_FRAGMENTS ?= ""
+
 def config_fragments(d):
-    fragments = []
+    fragments = d.getVar('KERNEL_CONFIG_FRAGMENTS').split()
     sources = d.getVar("SRC_URI").split()
     for s in sources:
         _, _, local, _, _, parm = bb.fetch.decodeurl(s)
@@ -284,17 +286,21 @@ def get_kernel_config_target(d):
 
     return config_target
 
-def get_kernel_config_fragments(d):
-    src_frags = " ".join(config_fragments(d))
-    out_frags = " ".join(map(lambda frag: 'debian/fragments/' + frag, config_fragments(d)))
-
-    linux_version_extension = d.getVar('LINUX_VERSION_EXTENSION')
-    if linux_version_extension:
-        out_frags += " debian/isar/version.cfg"
+KERNEL_CONFIG_FRAGMENTS:append = " \
+    ${@'${S}/debian/isar/version.cfg' if d.getVar('LINUX_VERSION_EXTENSION') else ''}"
 
-    return out_frags
+def get_kernel_config_fragments(d):
+    out_frags = ""
+    S = d.getVar('S') + '/'
+    for frag in config_fragments(d):
+        if frag.startswith(S):
+            out_frags += ' ' + frag[len(S):]
+        else:
+            out_frags += ' debian/fragments/' + frag
+    return out_frags.strip()
 
-KERNEL_CONFIG_FRAGMENTS = "${@get_kernel_config_fragments(d)}"
+# internal list of config fragments
+KCONFIG_FRAGMENTS = "${@get_kernel_config_fragments(d)}"
 
 dpkg_configure_kernel() {
 	grep -q "KERNEL_CONFIG_TARGET=" ${S}/debian/isar/configure ||
@@ -313,9 +319,12 @@ EOF
 	src_frags="${@ " ".join(config_fragments(d)) }"
 	rm -rf ${S}/debian/fragments
 	for frag in ${src_frags}; do
-		basedir=$(dirname ${frag})
-		mkdir -p ${S}/debian/fragments/${basedir}
-		cp ${WORKDIR}/${frag} ${S}/debian/fragments/${basedir}/
+		# skip frag if it starts with ${S}, thus is part of the sources
+		if [ "${frag#${S}}" = "$frag" ]; then
+			basedir=$(dirname ${frag})
+			mkdir -p ${S}/debian/fragments/${basedir}
+			cp ${WORKDIR}/${frag} ${S}/debian/fragments/${basedir}/
+		fi
 	done
 }
 
diff --git a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
index 73f554ed..75c920b8 100644
--- a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
@@ -26,7 +26,7 @@ do_configure() {
         # Process kernel config target and fragments
         ${MAKE} O=${KERNEL_BUILD_DIR} ${KERNEL_CONFIG_TARGET}
         ./scripts/kconfig/merge_config.sh -O ${KERNEL_BUILD_DIR}/ \
-            ${KERNEL_BUILD_DIR}/.config ${KERNEL_CONFIG_FRAGMENTS}
+            ${KERNEL_BUILD_DIR}/.config ${KCONFIG_FRAGMENTS}
     fi
 
     # Stop tracing
-- 
2.47.3

-- 
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/f8937fee-2491-49ed-9086-7be1f481a60a%40siemens.com.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible
  2026-03-23  7:03 [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible 'Jan Kiszka' via isar-users
@ 2026-03-25 15:22 ` Zhihang Wei
  2026-03-27 16:58   ` [PATCH] meta-isar: linux-mainline: Adjust config fragment usage 'Jan Kiszka' via isar-users
  2026-04-01 15:43 ` [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible Zhihang Wei
  1 sibling, 1 reply; 5+ messages in thread
From: Zhihang Wei @ 2026-03-25 15:22 UTC (permalink / raw)
  To: Jan Kiszka, isar-users



On 3/23/26 08:03, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This allows to add kernel config fragments from other sources than just
> individual files in SRC_URI.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> isar-cip-core will first use this, currently externalizing part of its
> in-tree fragments to the cip-kernel-config repo.
>
>   RECIPE-API-CHANGELOG.md                       |  9 +++++
>   meta/classes-recipe/linux-kernel.bbclass      | 37 ++++++++++++-------
>   .../linux/files/debian/isar/configure.tmpl    |  2 +-
>   3 files changed, 33 insertions(+), 15 deletions(-)
>
> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
> index e44b4b9d..2eff4fc3 100644
> --- a/RECIPE-API-CHANGELOG.md
> +++ b/RECIPE-API-CHANGELOG.md
> @@ -972,3 +972,12 @@ we introduce the variables ``MMAPTOPT_NOEXPKEYSIGN`` and ``DISTRO_MM_OPTS``.
>   While the former provides an argument to disable the key expiry checking, the
>   latter allows users to inject custom options into ``mmdebstrap``. For details,
>   see ``man mmdebstrap``. Use with care!
> +
> +### Provide additional fragments via KERNEL_CONFIG_FRAGMENTS
> +
> +Custom kernel builds can now inject config fragments into the build which were
> +not provided via individual SRC_URI entries. If a kernel source tree contains a
> +fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to
> +`KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as
> +part of a repository, a tarball, or some other directory structure, just
> +specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`.
> diff --git a/meta/classes-recipe/linux-kernel.bbclass b/meta/classes-recipe/linux-kernel.bbclass
> index 6e383408..9429996f 100644
> --- a/meta/classes-recipe/linux-kernel.bbclass
> +++ b/meta/classes-recipe/linux-kernel.bbclass
> @@ -83,7 +83,7 @@ TEMPLATE_VARS += "                \
>       KERNEL_LIBC_DEV_ARCH          \
>       LINUX_VERSION_EXTENSION       \
>       KERNEL_NAME_PROVIDED          \
> -    KERNEL_CONFIG_FRAGMENTS       \
> +    KCONFIG_FRAGMENTS             \
>       KCFLAGS                       \
>       KAFLAGS                       \
>       DISTRIBUTOR                   \
> @@ -214,8 +214,10 @@ KERNEL_ARCH ??= "${@get_kernel_arch(d)}"
>   # set KERNEL_FILE without depending on package arch used in bitbake.conf
>   KERNEL_FILE:forcevariable = "${@ 'vmlinux' if d.getVar('KERNEL_ARCH') in ['mipsel', 'riscv', 'arm64'] else 'vmlinuz'}"
>   
> +KERNEL_CONFIG_FRAGMENTS ?= ""
> +
>   def config_fragments(d):
> -    fragments = []
> +    fragments = d.getVar('KERNEL_CONFIG_FRAGMENTS').split()
>       sources = d.getVar("SRC_URI").split()
>       for s in sources:
>           _, _, local, _, _, parm = bb.fetch.decodeurl(s)
> @@ -284,17 +286,21 @@ def get_kernel_config_target(d):
>   
>       return config_target
>   
> -def get_kernel_config_fragments(d):
> -    src_frags = " ".join(config_fragments(d))
> -    out_frags = " ".join(map(lambda frag: 'debian/fragments/' + frag, config_fragments(d)))
> -
> -    linux_version_extension = d.getVar('LINUX_VERSION_EXTENSION')
> -    if linux_version_extension:
> -        out_frags += " debian/isar/version.cfg"
> +KERNEL_CONFIG_FRAGMENTS:append = " \
> +    ${@'${S}/debian/isar/version.cfg' if d.getVar('LINUX_VERSION_EXTENSION') else ''}"
>   
> -    return out_frags
> +def get_kernel_config_fragments(d):
> +    out_frags = ""
> +    S = d.getVar('S') + '/'
> +    for frag in config_fragments(d):
> +        if frag.startswith(S):
> +            out_frags += ' ' + frag[len(S):]
> +        else:
> +            out_frags += ' debian/fragments/' + frag
> +    return out_frags.strip()
>   
> -KERNEL_CONFIG_FRAGMENTS = "${@get_kernel_config_fragments(d)}"
> +# internal list of config fragments
> +KCONFIG_FRAGMENTS = "${@get_kernel_config_fragments(d)}"
>   
>   dpkg_configure_kernel() {
>   	grep -q "KERNEL_CONFIG_TARGET=" ${S}/debian/isar/configure ||
> @@ -313,9 +319,12 @@ EOF
>   	src_frags="${@ " ".join(config_fragments(d)) }"
>   	rm -rf ${S}/debian/fragments
>   	for frag in ${src_frags}; do
> -		basedir=$(dirname ${frag})
> -		mkdir -p ${S}/debian/fragments/${basedir}
> -		cp ${WORKDIR}/${frag} ${S}/debian/fragments/${basedir}/
> +		# skip frag if it starts with ${S}, thus is part of the sources
> +		if [ "${frag#${S}}" = "$frag" ]; then
> +			basedir=$(dirname ${frag})
> +			mkdir -p ${S}/debian/fragments/${basedir}
> +			cp ${WORKDIR}/${frag} ${S}/debian/fragments/${basedir}/
> +		fi
>   	done
>   }
>   
> diff --git a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
> index 73f554ed..75c920b8 100644
> --- a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
> +++ b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
> @@ -26,7 +26,7 @@ do_configure() {
>           # Process kernel config target and fragments
>           ${MAKE} O=${KERNEL_BUILD_DIR} ${KERNEL_CONFIG_TARGET}
>           ./scripts/kconfig/merge_config.sh -O ${KERNEL_BUILD_DIR}/ \
> -            ${KERNEL_BUILD_DIR}/.config ${KERNEL_CONFIG_FRAGMENTS}
> +            ${KERNEL_BUILD_DIR}/.config ${KCONFIG_FRAGMENTS}
>       fi
>   
>       # Stop tracing
Could you add a test case for this usage?

Zhihang

-- 
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/4327810b-f425-4602-a7a2-c9a40de071b3%40ilbers.de.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH] meta-isar: linux-mainline: Adjust config fragment usage
  2026-03-25 15:22 ` Zhihang Wei
@ 2026-03-27 16:58   ` 'Jan Kiszka' via isar-users
  2026-04-01 15:43     ` Zhihang Wei
  0 siblings, 1 reply; 5+ messages in thread
From: 'Jan Kiszka' via isar-users @ 2026-03-27 16:58 UTC (permalink / raw)
  To: Zhihang Wei, isar-users

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(-)

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
-- 
2.47.3

-- 
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/05c13543-490b-4109-98f1-09c8c295c376%40siemens.com.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible
  2026-03-23  7:03 [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible 'Jan Kiszka' via isar-users
  2026-03-25 15:22 ` Zhihang Wei
@ 2026-04-01 15:43 ` Zhihang Wei
  1 sibling, 0 replies; 5+ messages in thread
From: Zhihang Wei @ 2026-04-01 15:43 UTC (permalink / raw)
  To: Jan Kiszka, isar-users

Applied to next, thanks.

Zhihang

On 3/23/26 08:03, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This allows to add kernel config fragments from other sources than just
> individual files in SRC_URI.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> isar-cip-core will first use this, currently externalizing part of its
> in-tree fragments to the cip-kernel-config repo.
>
>   RECIPE-API-CHANGELOG.md                       |  9 +++++
>   meta/classes-recipe/linux-kernel.bbclass      | 37 ++++++++++++-------
>   .../linux/files/debian/isar/configure.tmpl    |  2 +-
>   3 files changed, 33 insertions(+), 15 deletions(-)
>
> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
> index e44b4b9d..2eff4fc3 100644
> --- a/RECIPE-API-CHANGELOG.md
> +++ b/RECIPE-API-CHANGELOG.md
> @@ -972,3 +972,12 @@ we introduce the variables ``MMAPTOPT_NOEXPKEYSIGN`` and ``DISTRO_MM_OPTS``.
>   While the former provides an argument to disable the key expiry checking, the
>   latter allows users to inject custom options into ``mmdebstrap``. For details,
>   see ``man mmdebstrap``. Use with care!
> +
> +### Provide additional fragments via KERNEL_CONFIG_FRAGMENTS
> +
> +Custom kernel builds can now inject config fragments into the build which were
> +not provided via individual SRC_URI entries. If a kernel source tree contains a
> +fragment, this can be specified via adding `${S}/path/to/fragment.cfg` to
> +`KERNEL_CONFIG_FRAGMENTS`. If a fragment was checked out into ${WORKDIR} as
> +part of a repository, a tarball, or some other directory structure, just
> +specify it relative to ${WORKDIR} in `KERNEL_CONFIG_FRAGMENTS`.
> diff --git a/meta/classes-recipe/linux-kernel.bbclass b/meta/classes-recipe/linux-kernel.bbclass
> index 6e383408..9429996f 100644
> --- a/meta/classes-recipe/linux-kernel.bbclass
> +++ b/meta/classes-recipe/linux-kernel.bbclass
> @@ -83,7 +83,7 @@ TEMPLATE_VARS += "                \
>       KERNEL_LIBC_DEV_ARCH          \
>       LINUX_VERSION_EXTENSION       \
>       KERNEL_NAME_PROVIDED          \
> -    KERNEL_CONFIG_FRAGMENTS       \
> +    KCONFIG_FRAGMENTS             \
>       KCFLAGS                       \
>       KAFLAGS                       \
>       DISTRIBUTOR                   \
> @@ -214,8 +214,10 @@ KERNEL_ARCH ??= "${@get_kernel_arch(d)}"
>   # set KERNEL_FILE without depending on package arch used in bitbake.conf
>   KERNEL_FILE:forcevariable = "${@ 'vmlinux' if d.getVar('KERNEL_ARCH') in ['mipsel', 'riscv', 'arm64'] else 'vmlinuz'}"
>   
> +KERNEL_CONFIG_FRAGMENTS ?= ""
> +
>   def config_fragments(d):
> -    fragments = []
> +    fragments = d.getVar('KERNEL_CONFIG_FRAGMENTS').split()
>       sources = d.getVar("SRC_URI").split()
>       for s in sources:
>           _, _, local, _, _, parm = bb.fetch.decodeurl(s)
> @@ -284,17 +286,21 @@ def get_kernel_config_target(d):
>   
>       return config_target
>   
> -def get_kernel_config_fragments(d):
> -    src_frags = " ".join(config_fragments(d))
> -    out_frags = " ".join(map(lambda frag: 'debian/fragments/' + frag, config_fragments(d)))
> -
> -    linux_version_extension = d.getVar('LINUX_VERSION_EXTENSION')
> -    if linux_version_extension:
> -        out_frags += " debian/isar/version.cfg"
> +KERNEL_CONFIG_FRAGMENTS:append = " \
> +    ${@'${S}/debian/isar/version.cfg' if d.getVar('LINUX_VERSION_EXTENSION') else ''}"
>   
> -    return out_frags
> +def get_kernel_config_fragments(d):
> +    out_frags = ""
> +    S = d.getVar('S') + '/'
> +    for frag in config_fragments(d):
> +        if frag.startswith(S):
> +            out_frags += ' ' + frag[len(S):]
> +        else:
> +            out_frags += ' debian/fragments/' + frag
> +    return out_frags.strip()
>   
> -KERNEL_CONFIG_FRAGMENTS = "${@get_kernel_config_fragments(d)}"
> +# internal list of config fragments
> +KCONFIG_FRAGMENTS = "${@get_kernel_config_fragments(d)}"
>   
>   dpkg_configure_kernel() {
>   	grep -q "KERNEL_CONFIG_TARGET=" ${S}/debian/isar/configure ||
> @@ -313,9 +319,12 @@ EOF
>   	src_frags="${@ " ".join(config_fragments(d)) }"
>   	rm -rf ${S}/debian/fragments
>   	for frag in ${src_frags}; do
> -		basedir=$(dirname ${frag})
> -		mkdir -p ${S}/debian/fragments/${basedir}
> -		cp ${WORKDIR}/${frag} ${S}/debian/fragments/${basedir}/
> +		# skip frag if it starts with ${S}, thus is part of the sources
> +		if [ "${frag#${S}}" = "$frag" ]; then
> +			basedir=$(dirname ${frag})
> +			mkdir -p ${S}/debian/fragments/${basedir}
> +			cp ${WORKDIR}/${frag} ${S}/debian/fragments/${basedir}/
> +		fi
>   	done
>   }
>   
> diff --git a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
> index 73f554ed..75c920b8 100644
> --- a/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
> +++ b/meta/recipes-kernel/linux/files/debian/isar/configure.tmpl
> @@ -26,7 +26,7 @@ do_configure() {
>           # Process kernel config target and fragments
>           ${MAKE} O=${KERNEL_BUILD_DIR} ${KERNEL_CONFIG_TARGET}
>           ./scripts/kconfig/merge_config.sh -O ${KERNEL_BUILD_DIR}/ \
> -            ${KERNEL_BUILD_DIR}/.config ${KERNEL_CONFIG_FRAGMENTS}
> +            ${KERNEL_BUILD_DIR}/.config ${KCONFIG_FRAGMENTS}
>       fi
>   
>       # Stop tracing

-- 
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/12909b48-a746-4bbd-bc82-78ed0caae293%40ilbers.de.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] meta-isar: linux-mainline: Adjust config fragment usage
  2026-03-27 16:58   ` [PATCH] meta-isar: linux-mainline: Adjust config fragment usage 'Jan Kiszka' via isar-users
@ 2026-04-01 15:43     ` Zhihang Wei
  0 siblings, 0 replies; 5+ messages in thread
From: Zhihang Wei @ 2026-04-01 15:43 UTC (permalink / raw)
  To: Jan Kiszka, isar-users

Applied to next, thanks.

Zhihang

On 3/27/26 17:58, Jan Kiszka wrote:
> 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(-)
>
> 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

-- 
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/e7c7fb62-e6e5-49df-b3fe-b380ecfe865c%40ilbers.de.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-04-01 15:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-03-23  7:03 [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible 'Jan Kiszka' via isar-users
2026-03-25 15:22 ` Zhihang Wei
2026-03-27 16:58   ` [PATCH] meta-isar: linux-mainline: Adjust config fragment usage 'Jan Kiszka' via isar-users
2026-04-01 15:43     ` Zhihang Wei
2026-04-01 15:43 ` [PATCH] meta: kernel: Make specifying KERNEL_CONFIG_FRAGMENTS more flexible Zhihang Wei

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox