| Message ID | 1430231675-8613-2-git-send-email-bos@je-eigen-domein.nl |
|---|---|
| State | Accepted |
| Headers | show |
On 28/04/15 16:34, Floris Bos wrote: > Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> > --- > linux/Config.in | 6 ++++++ > linux/linux.mk | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/linux/Config.in b/linux/Config.in > index 0ab9f26..ac483c1 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -164,6 +164,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE > Note: this can be a defconfig file or a complete .config file, > which can later be saved back with make linux-update-(def)config. > > +config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES > + string "Additional configuration fragment files" > + help > + A space-separated list of kernel configuration fragment files, > + that will be merged to the main kernel configuration file. Oh, of course we'll still need this additional config option, because the main defconfig could be in-tree while the fragments are external. Silly me. I'll come back to the first patch. This one already gets my Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Regards, Arnout > + > # > # Binary format > # > diff --git a/linux/linux.mk b/linux/linux.mk > index 0c348da..694061e 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -175,6 +175,7 @@ KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)) > endif > > LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) > +LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES)) > LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig > LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) > >
On 28/04/15 16:34, Floris Bos wrote: > Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (see previous patch) Regards, Arnout > --- > linux/Config.in | 6 ++++++ > linux/linux.mk | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/linux/Config.in b/linux/Config.in > index 0ab9f26..ac483c1 100644 > --- a/linux/Config.in > +++ b/linux/Config.in > @@ -164,6 +164,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE > Note: this can be a defconfig file or a complete .config file, > which can later be saved back with make linux-update-(def)config. > > +config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES > + string "Additional configuration fragment files" > + help > + A space-separated list of kernel configuration fragment files, > + that will be merged to the main kernel configuration file. > + > # > # Binary format > # > diff --git a/linux/linux.mk b/linux/linux.mk > index 0c348da..694061e 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -175,6 +175,7 @@ KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)) > endif > > LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) > +LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES)) > LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig > LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) > >
On 2 May 2015 at 20:44, Arnout Vandecappelle <arnout@mind.be> wrote: > On 28/04/15 16:34, Floris Bos wrote: >> Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> > > Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > (see previous patch) Tested-by: Gergely Imreh <imrehg@gmail.com> together with v2 1/5 of this patch series > > Regards, > Arnout > >> --- >> linux/Config.in | 6 ++++++ >> linux/linux.mk | 1 + >> 2 files changed, 7 insertions(+) >> >> diff --git a/linux/Config.in b/linux/Config.in >> index 0ab9f26..ac483c1 100644 >> --- a/linux/Config.in >> +++ b/linux/Config.in >> @@ -164,6 +164,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE >> Note: this can be a defconfig file or a complete .config file, >> which can later be saved back with make linux-update-(def)config. >> >> +config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES >> + string "Additional configuration fragment files" >> + help >> + A space-separated list of kernel configuration fragment files, >> + that will be merged to the main kernel configuration file. >> + >> # >> # Binary format >> # >> diff --git a/linux/linux.mk b/linux/linux.mk >> index 0c348da..694061e 100644 >> --- a/linux/linux.mk >> +++ b/linux/linux.mk >> @@ -175,6 +175,7 @@ KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)) >> endif >> >> LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) >> +LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES)) >> LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig >> LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) >> >> > > > -- > Arnout Vandecappelle arnout at mind be > Senior Embedded Software Architect +32-16-286500 > Essensium/Mind http://www.mind.be > G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven > LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle > GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/linux/Config.in b/linux/Config.in index 0ab9f26..ac483c1 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -164,6 +164,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE Note: this can be a defconfig file or a complete .config file, which can later be saved back with make linux-update-(def)config. +config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES + string "Additional configuration fragment files" + help + A space-separated list of kernel configuration fragment files, + that will be merged to the main kernel configuration file. + # # Binary format # diff --git a/linux/linux.mk b/linux/linux.mk index 0c348da..694061e 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -175,6 +175,7 @@ KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)) endif LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG) +LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES)) LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS)
Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> --- linux/Config.in | 6 ++++++ linux/linux.mk | 1 + 2 files changed, 7 insertions(+)