Skip to contentSkip to conversation

Linux kernel: add support for config fragment files

PATCH New Floris Bos 3 participants 6 messages Feb 10, 2015 – Feb 14, 2015

lore
Share & tools
lore

Floris Bos

author
#0 lore raw

PATCH 1/1 Linux kernel: add support for config fragment files

Adds configuration option to merge additional kernel configuration files to the main kernel configuration using scripts/kconfig/merge_config.sh

For use-cases in which it is desired to build a custom Linux kernel based on the defconfig of the target device, but with a couple extra options/modules enabled.

---
 linux/Config.in | 6 ++++++
 linux/linux.mk  | 3 +++
 2 files changed, 9 insertions(+)
linux/Config.in +6 -0
index c981493..afa68b0 100644
@@ -161,6 +161,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 	help
 	  Path to the kernel configuration file
 
+config BR2_LINUX_KERNEL_CONFIG_FRAGMENTS
+	string "Additional configuration fragment files"
+	help
+	  A space-seperated list of kernel configuration fragment files,
+	  that will be merged to the main kernel configuration file.
+
 #
 # Binary format
 #
linux/linux.mk +3 -0
index 29f59e8..02c3f66 100644
@@ -39,6 +39,7 @@ endif # -rc
 endif
 
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
+LINUX_KERNEL_CONFIG_FRAGMENTS = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENTS))
 
 LINUX_INSTALL_IMAGES = YES
 LINUX_DEPENDENCIES += host-kmod host-lzop
@@ -178,6 +179,8 @@ define LINUX_CONFIGURE_CMDS
 	$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+	$(if $(LINUX_KERNEL_CONFIG_FRAGMENTS),
+		$(@D)/scripts/kconfig/merge_config.sh -m -O $(@D) $(@D)/.config $(LINUX_KERNEL_CONFIG_FRAGMENTS))
 	$(if $(BR2_arm)$(BR2_armeb),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config))
 	$(if $(BR2_TARGET_ROOTFS_CPIO),
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 Linux kernel: add support for config fragment files

Hi Floris,

Quoted 9 lines · Floris Bos

Adds configuration option to merge additional kernel configuration files to the main kernel configuration using scripts/kconfig/merge_config.sh

For use-cases in which it is desired to build a custom Linux kernel based on the defconfig of the target device, but with a couple extra options/modules enabled.

---

[...]

linux/linux.mk define LINUX_CONFIGURE_CMDS · line 183

Quoted 6 lines
linux/linux.mk +2 -0
@@ -178,6 +179,8 @@ define LINUX_CONFIGURE_CMDS
 	$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+	$(if $(LINUX_KERNEL_CONFIG_FRAGMENTS),
+		$(@D)/scripts/kconfig/merge_config.sh -m -O $(@D) $(@D)/.config $(LINUX_KERNEL_CONFIG_FRAGMENTS))

The merge_config.sh script is in the kernel since version 3.3. The -O parameter is only supported since v3.9. How do you handle older kernels?

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#2 lore raw

PATCH 1/1 Linux kernel: add support for config fragment files

Quoted 12 lines · Baruch Siach
Quoted 9 lines · Floris Bos

Adds configuration option to merge additional kernel configuration files to the main kernel configuration using scripts/kconfig/merge_config.sh

For use-cases in which it is desired to build a custom Linux kernel based on the defconfig of the target device, but with a couple extra options/modules enabled.

---

[...]

Quoted 8 lines

linux/linux.mk define LINUX_CONFIGURE_CMDS · line 183

Quoted 6 lines
linux/linux.mk +2 -0
@@ -178,6 +179,8 @@ define LINUX_CONFIGURE_CMDS
  	$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
  	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
  	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+	$(if $(LINUX_KERNEL_CONFIG_FRAGMENTS),
+		$(@D)/scripts/kconfig/merge_config.sh -m -O $(@D) $(@D)/.config $(LINUX_KERNEL_CONFIG_FRAGMENTS))

The merge_config.sh script is in the kernel since version 3.3. The -O parameter is only supported since v3.9. How do you handle older kernels?

Could make it use the merge_config.sh we have in buildroot (in support/kconfig) instead, if support for old kernel versions is a requirement.

Yours sincerely,

Floris Bos

#3 lore raw

PATCH 1/1 Linux kernel: add support for config fragment files

Hi Floris,

Quoted 22 lines · Floris Bos
Quoted 12 lines · Baruch Siach
Quoted 9 lines · Floris Bos

Adds configuration option to merge additional kernel configuration files to the main kernel configuration using scripts/kconfig/merge_config.sh

For use-cases in which it is desired to build a custom Linux kernel based on the defconfig of the target device, but with a couple extra options/modules enabled.

---

[...]

Quoted 8 lines

linux/linux.mk define LINUX_CONFIGURE_CMDS · line 183

Quoted 6 lines
linux/linux.mk +2 -0
@@ -178,6 +179,8 @@ define LINUX_CONFIGURE_CMDS
 	$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
 	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
 	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+	$(if $(LINUX_KERNEL_CONFIG_FRAGMENTS),
+		$(@D)/scripts/kconfig/merge_config.sh -m -O $(@D) $(@D)/.config $(LINUX_KERNEL_CONFIG_FRAGMENTS))

The merge_config.sh script is in the kernel since version 3.3. The -O parameter is only supported since v3.9. How do you handle older kernels?

Quoted 3 lines

Could make it use the merge_config.sh we have in buildroot (in support/kconfig) instead, if support for old kernel versions is a requirement.

Sounds better, IMO. You may also consider going one further step, and add this feature to the generic kconfig infrastructure.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#4 lore raw

PATCH 1/1 Linux kernel: add support for config fragment files

In reply to Floris Bos

Dear Floris Bos,

linux/Config.in config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE · line 168

Quoted 5 lines · Floris Bos
linux/Config.in +5 -0
+config BR2_LINUX_KERNEL_CONFIG_FRAGMENTS
+	string "Additional configuration fragment files"
+	help
+	  A space-seperated list of kernel configuration fragment files,
+	  that will be merged to the main kernel configuration file.

Instead of introducing a new option for this, can't we make the existing option that provides the kernel configuration file path a space-separated option that allows you to pass multiple kernel config file fragments?

Or maybe you want to support the combination of a kernel defconfig + some fragments?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH 1/1 Linux kernel: add support for config fragment files

Hi Thomas,

Quoted 14 lines · Thomas Petazzoni

Dear Floris Bos,

linux/Config.in config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE · line 168

Quoted 5 lines · Floris Bos
linux/Config.in +5 -0
+config BR2_LINUX_KERNEL_CONFIG_FRAGMENTS
+	string "Additional configuration fragment files"
+	help
+	  A space-seperated list of kernel configuration fragment files,
+	  that will be merged to the main kernel configuration file.

Instead of introducing a new option for this, can't we make the existing option that provides the kernel configuration file path a space-separated option that allows you to pass multiple kernel config file fragments?

Quoted 2 lines

Or maybe you want to support the combination of a kernel defconfig + some fragments?

As mentioned in the commit message my use-case indeed involves combining a kernel defconfig with a fragment.
To be more precise: I simply want to stay in sync with the Raspberry Pi defconfig -which changes a lot-, with a few tiny modifications of my own.

Signature · 3 lines
Yours sincerely,

Floris Bos