Linux kernel: add support for config fragment files
PATCH v2 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 support/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.
Changes v1 -> v2:
Use the merge_config.sh bundled with buildroot, instead of the one bundled with the kernel, as older kernel versions do not have it.
--- linux/Config.in | 6 ++++++ linux/linux.mk | 3 +++ 2 files changed, 9 insertions(+)
linux/Config.in +6 -0
@@ -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
@@ -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), + $(TOPDIR)/support/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
PATCH v2 1/1 Linux kernel: add support for config fragment files
Floris, All,
On 2015-02-14 14:46 +0100, Floris Bos spake thusly:
Quoted 11 lines
Adds configuration option to merge additional kernel configuration files to the main kernel configuration using
support/kconfig/merge_config.shFor 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.
Changes v1 -> v2:
Use the
merge_config.shbundled with buildroot, instead of the one bundled with the kernel, as older kernel versions do not have it.
This "Changes" blrub should after the '---' line, below.
Quoted 36 lines
Signed-off-by Floris Bos <[email protected]>--- linux/Config.in | 6 ++++++ linux/linux.mk | 3 +++ 2 files changed, 9 insertions(+)linux/Config.in +6
-0@@ -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 +1
-0@@ -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
linux/linux.mk define LINUX_CONFIGURE_CMDS · line 183
Quoted 5 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), + $(TOPDIR)/support/kconfig/merge_config.sh -m -O $(@D) $(@D)/.config $(LINUX_KERNEL_CONFIG_FRAGMENTS))
As Baruch suggested earlier, this could be usefull to have such a feature available to all our kconfig-packages: linux, busybox, uclibc and barebox.
Granted, when you did your patch, the kernel was not yet using the kconfig-package infra. But it now does (since Thomas P. applied the series a few minutes ago! ;-) )
Could you rework your patch to integrate this feature in the kconfig-package infra, please?
Something like (shortlog-like):
kconfig-package: add support for config fragments
linux: add option to specify config fragments
busybox: add option to specify config fragments
uclibc: add option to specify config fragments
barebox: add option to specify config fragments
As for how to pass the the config fragments: just pas them all in the _KCONFIG_FILE variable, and in package/pkg-kconfig.mk, replace line 54 with something like (untested):
support/kconfig/merge_config.sh -m -O $(@D) $$($(2)_KCONFIG_FILE)
Callers will have to pass the base config file first and any fragment asfter that, like so:
LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) $(call qstrip,$(LINUX_KERNEL_CONFIG_FRAGMENTS))
(Of course, we are again hitting the singular option that accepts multiple entries, and in retrospect, we should have called it just FOO_KCONFIG_FILES. We can change that, but later (after we apply the support for fragments).
Regards,
Yann E. MORIN.
Quoted 10 lines
linux/linux.mk +0
-0$(if $(BR2_arm)$(BR2_armeb), $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config)) $(if $(BR2_TARGET_ROOTFS_CPIO),Signature · 6 lines
1.9.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 Linux kernel: add support for config fragment files
Hi,
Quoted 83 lines · Yann E. MORIN
On 2015-02-14 14:46 +0100, Floris Bos spake thusly:
Quoted 11 lines
Adds configuration option to merge additional kernel configuration files to the main kernel configuration using
support/kconfig/merge_config.shFor 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.
Changes v1 -> v2:
Use the
merge_config.shbundled with buildroot, instead of the one bundled with the kernel, as older kernel versions do not have it.This "Changes" blrub should after the '---' line, below.
Quoted 36 lines
Signed-off-by Floris Bos <[email protected]>--- linux/Config.in | 6 ++++++ linux/linux.mk | 3 +++ 2 files changed, 9 insertions(+)linux/Config.in +6
-0@@ -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 +1
-0@@ -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-lzoplinux/linux.mk define LINUX_CONFIGURE_CMDS · line 183
Quoted 5 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), + $(TOPDIR)/support/kconfig/merge_config.sh -m -O $(@D) $(@D)/.config $(LINUX_KERNEL_CONFIG_FRAGMENTS))As Baruch suggested earlier, this could be usefull to have such a feature available to all our kconfig-packages: linux, busybox, uclibc and barebox.
Granted, when you did your patch, the kernel was not yet using the kconfig-package infra. But it now does (since Thomas P. applied the series a few minutes ago! ;-) )
Could you rework your patch to integrate this feature in the kconfig-package infra, please?
Something like (shortlog-like):
kconfig-package: add support for config fragments
linux: add option to specify config fragments
busybox: add option to specify config fragments
uclibc: add option to specify config fragments
barebox: add option to specify config fragmentsAs for how to pass the the config fragments: just pas them all in the
_KCONFIG_FILEvariable, and inpackage/pkg-kconfig.mk, replace line 54 with something like (untested):support/kconfig/merge_config.sh -m -O $(@D) $$($(2)_KCONFIG_FILE)Callers will have to pass the base config file first and any fragment asfter that, like so:
Quoted 6 lines
LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) $(call qstrip,$(LINUX_KERNEL_CONFIG_FRAGMENTS))(Of course, we are again hitting the singular option that accepts multiple entries, and in retrospect, we should have called it just
FOO_KCONFIG_FILES. We can change that, but later (after we apply the support for fragments).
Problem I see with passing multiple files in the LINUX_KCONFIG_FILE variable -as opposed to using a separate variable- is that the variable is currently also used as destination file.
If you do "make linux-menuconfig", change some settings, do "make linux-updateconfig", the kconfig infrastructure copies .config back to LINUX_KCONFIG_FILE.
So would require more extensive modification.
Talking about which.
I am also not sure how updateconfig should behave in case there are fragments.
Should it compute the differences between the original configuration and after the user edited it, and save the changes to the (last) fragment in the list?
Is there any good ready-made shell script for comparing .config files that we could use for that?
I know that there is diffconfig that comes with the kernel source, but it requires python, and would need to be modified to output in the right format.
Yours sincerely,
Floris Bos
PATCH v2 1/1 Linux kernel: add support for config fragment files
Floris, All,
On 2015-02-14 23:39 +0100, Floris Bos spake thusly:
Quoted 4 lines · Yann E. MORIN
Quoted 3 lines
On 2015-02-14 14:46 +0100, Floris Bos spake thusly:
Quoted 2 lines
Adds configuration option to merge additional kernel configuration files to the main kernel configuration using
support/kconfig/merge_config.sh
[--SNIP--]
Quoted 2 lines
Quoted 2 lines
Could you rework your patch to integrate this feature in the kconfig-package infra, please?
[--SNIP--]
Quoted 1 line
Quoted 1 line
LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) $(call qstrip,$(LINUX_KERNEL_CONFIG_FRAGMENTS))
[--SNIP--]
Quoted 3 lines
Problem I see with passing multiple files in the
LINUX_KCONFIG_FILEvariable -as opposed to using a separate variable- is that the variable is currently also used as destination file.
Ah, you're right, of coursei. Nice catch!
Then you'll have to introduce a new FOO_KCONFIG_FRAGMENT_FILES.
Quoted 3 lines
If you do "make linux-menuconfig", change some settings, do "make linux-updateconfig", the kconfig infrastructure copies .config back to
LINUX_KCONFIG_FILE.
Yes, that's right.
Quoted 11 lines
Talking about which.
I am also not sure how updateconfig should behave in case there are fragments.
Should it compute the differences between the original configuration and after the user edited it, and save the changes to the (last) fragment in the list?
Is there any good ready-made shell script for comparing .config files that we could use for that?
I know that there is diffconfig that comes with the kernel source, but it requires python, and would need to be modified to output in the right format.
There are three options here:
1- we just copy the .config back to FOO_KCONFIG_FILE, and leave to the
user the duty to further strip it if need be;
2- we try to be smart and deal with regenerating a config file that
does not contain any of the fragments, and we fail (because that is really complex);
3- we just error out in case fragments are being used, because we don't
know how to save a (def)config file in this case (see above: it's really compex).
My opinion would be we go with 3 (my prefernce) or 1, not 2.
Note that the problem of saving back the (def)config is not due to integrating support for fragments in the kconfig-package infra; your initial patch already exposed that problem (whether the kernel used or not the kconfig-package infra).
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/1 Linux kernel: add support for config fragment files
Yann, Floris,
Quoted 9 lines · Yann E. MORIN
There are three options here:
1- we just copy the .config back to
FOO_KCONFIG_FILE, and leave to theuser the duty to further strip it if need be;2- we try to be smart and deal with regenerating a config file that
does not contain any of the fragments, and we fail (because that is really complex);
Quoted 5 lines
3- we just error out in case fragments are being used, because we don't
know how to save a (def)config file in this case (see above: it's really compex).My opinion would be we go with 3 (my prefernce) or 1, not 2.
My preference would also be option (3).
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com