From 32a39c7910f5aecc900b32acb7d21a45bb73dfce Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 7 Sep 2021 13:27:46 +0200 Subject: [PATCH] linux-dey: add support for configuration fragments This allows users to apply small changes to our kernel configuration without having to create a completely new defconfig. Use a simplified version of the kernel-yocto.bbclass implementation. https://onedigi.atlassian.net/browse/DEL-6706 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb index 29145ed4f..d3d620517 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb @@ -88,4 +88,14 @@ do_copy_defconfig () { } addtask copy_defconfig after do_patch before do_kernel_localversion +# Apply configuration fragments +do_configure_append() { + # Only accept fragments ending in .cfg. If the fragments contain + # something other than kernel configs, it will be filtered out + # automatically. + if [ -f ${WORKDIR}/*.cfg ]; then + ${S}/scripts/kconfig/merge_config.sh -O ${B} ${B}/.config ${WORKDIR}/*.cfg + fi +} + COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m|ccimx6)"