* [Buildroot] [PATCH 2/5] linux: add option to specify config fragments
2015-02-15 12:33 [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments Floris Bos
@ 2015-02-15 12:33 ` Floris Bos
2015-03-20 23:15 ` Yann E. MORIN
2015-02-15 12:33 ` [Buildroot] [PATCH 3/5] busybox: " Floris Bos
` (4 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Floris Bos @ 2015-02-15 12:33 UTC (permalink / raw)
To: buildroot
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 95c847b..15dc3b4 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -161,6 +161,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
help
Path to the kernel configuration file
+config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES
+ 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
#
diff --git a/linux/linux.mk b/linux/linux.mk
index fc90fc5..f564530 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)
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 2/5] linux: add option to specify config fragments
2015-02-15 12:33 ` [Buildroot] [PATCH 2/5] linux: add option to specify " Floris Bos
@ 2015-03-20 23:15 ` Yann E. MORIN
0 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2015-03-20 23:15 UTC (permalink / raw)
To: buildroot
Floris, All,
On 2015-02-15 13:33 +0100, Floris Bos spake thusly:
> 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 95c847b..15dc3b4 100644
> --- a/linux/Config.in
> +++ b/linux/Config.in
> @@ -161,6 +161,12 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
> help
> Path to the kernel configuration file
>
> +config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES
> + string "Additional configuration fragment files"
> + help
> + A space-seperated list of kernel configuration fragment files,
separated
Otherwise, OK:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> + that will be merged to the main kernel configuration file.
> +
> #
> # Binary format
> #
> diff --git a/linux/linux.mk b/linux/linux.mk
> index fc90fc5..f564530 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)
>
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 3/5] busybox: add option to specify config fragments
2015-02-15 12:33 [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments Floris Bos
2015-02-15 12:33 ` [Buildroot] [PATCH 2/5] linux: add option to specify " Floris Bos
@ 2015-02-15 12:33 ` Floris Bos
2015-03-20 23:20 ` Yann E. MORIN
2015-02-15 12:33 ` [Buildroot] [PATCH 4/5] uclibc: " Floris Bos
` (3 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Floris Bos @ 2015-02-15 12:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
---
package/busybox/Config.in | 6 ++++++
package/busybox/busybox.mk | 1 +
2 files changed, 7 insertions(+)
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index f2f2990..5bc6f9d 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -20,6 +20,12 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
Most people will just use the default BusyBox configuration file.
+config BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES
+ string "Additional BusyBox configuration fragment files"
+ help
+ A space-seperated list of configuration fragment files,
+ that will be merged to the main BusyBox configuration file.
+
config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
bool "Show packages that are also provided by busybox"
help
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 61f6a16..7d2fb79 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -46,6 +46,7 @@ ifndef BUSYBOX_CONFIG_FILE
endif
BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
+BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES))
BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 3/5] busybox: add option to specify config fragments
2015-02-15 12:33 ` [Buildroot] [PATCH 3/5] busybox: " Floris Bos
@ 2015-03-20 23:20 ` Yann E. MORIN
0 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2015-03-20 23:20 UTC (permalink / raw)
To: buildroot
Floris, All,
On 2015-02-15 13:33 +0100, Floris Bos spake thusly:
> Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
> ---
> package/busybox/Config.in | 6 ++++++
> package/busybox/busybox.mk | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/package/busybox/Config.in b/package/busybox/Config.in
> index f2f2990..5bc6f9d 100644
> --- a/package/busybox/Config.in
> +++ b/package/busybox/Config.in
> @@ -20,6 +20,12 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
>
> Most people will just use the default BusyBox configuration file.
>
> +config BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES
> + string "Additional BusyBox configuration fragment files"
> + help
> + A space-seperated list of configuration fragment files,
separated
Otherwise, OK:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> + that will be merged to the main BusyBox configuration file.
> +
> config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> bool "Show packages that are also provided by busybox"
> help
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 61f6a16..7d2fb79 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -46,6 +46,7 @@ ifndef BUSYBOX_CONFIG_FILE
> endif
>
> BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
> +BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES))
> BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
> BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
>
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 4/5] uclibc: add option to specify config fragments
2015-02-15 12:33 [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments Floris Bos
2015-02-15 12:33 ` [Buildroot] [PATCH 2/5] linux: add option to specify " Floris Bos
2015-02-15 12:33 ` [Buildroot] [PATCH 3/5] busybox: " Floris Bos
@ 2015-02-15 12:33 ` Floris Bos
2015-03-20 23:22 ` Yann E. MORIN
2015-02-15 12:33 ` [Buildroot] [PATCH 5/5] barebox: " Floris Bos
` (2 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Floris Bos @ 2015-02-15 12:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
---
package/uclibc/Config.in | 6 ++++++
package/uclibc/uclibc.mk | 1 +
2 files changed, 7 insertions(+)
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index aa99a6f..1be9195 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -53,6 +53,12 @@ config BR2_UCLIBC_CONFIG
See also docs/README in this package.
If unsure, use the default.
+config BR2_UCLIBC_CONFIG_FRAGMENT_FILES
+ string "Additional uClibc configuration fragment files"
+ help
+ A space-seperated list of configuration fragment files,
+ that will be merged to the main uClibc configuration file.
+
config BR2_TOOLCHAIN_BUILDROOT_LARGEFILE
bool "Enable large file (files > 2 GB) support"
select BR2_LARGEFILE
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 40e6c6c..9d73b39 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -38,6 +38,7 @@ UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG))
endif
UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
+UCLIBC_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_UCLIBC_CONFIG_FRAGMENT_FILES))
UCLIBC_KCONFIG_OPTS = \
$(UCLIBC_MAKE_FLAGS) \
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 4/5] uclibc: add option to specify config fragments
2015-02-15 12:33 ` [Buildroot] [PATCH 4/5] uclibc: " Floris Bos
@ 2015-03-20 23:22 ` Yann E. MORIN
0 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2015-03-20 23:22 UTC (permalink / raw)
To: buildroot
Floris, All,
On 2015-02-15 13:33 +0100, Floris Bos spake thusly:
> Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
> ---
> package/uclibc/Config.in | 6 ++++++
> package/uclibc/uclibc.mk | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
> index aa99a6f..1be9195 100644
> --- a/package/uclibc/Config.in
> +++ b/package/uclibc/Config.in
> @@ -53,6 +53,12 @@ config BR2_UCLIBC_CONFIG
> See also docs/README in this package.
> If unsure, use the default.
>
> +config BR2_UCLIBC_CONFIG_FRAGMENT_FILES
> + string "Additional uClibc configuration fragment files"
> + help
> + A space-seperated list of configuration fragment files,
separated Well... you know the tune, now. ;-)
Otherwise, OK:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> + that will be merged to the main uClibc configuration file.
> +
> config BR2_TOOLCHAIN_BUILDROOT_LARGEFILE
> bool "Enable large file (files > 2 GB) support"
> select BR2_LARGEFILE
> diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
> index 40e6c6c..9d73b39 100644
> --- a/package/uclibc/uclibc.mk
> +++ b/package/uclibc/uclibc.mk
> @@ -38,6 +38,7 @@ UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG))
> endif
>
> UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
> +UCLIBC_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_UCLIBC_CONFIG_FRAGMENT_FILES))
>
> UCLIBC_KCONFIG_OPTS = \
> $(UCLIBC_MAKE_FLAGS) \
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 5/5] barebox: add option to specify config fragments
2015-02-15 12:33 [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments Floris Bos
` (2 preceding siblings ...)
2015-02-15 12:33 ` [Buildroot] [PATCH 4/5] uclibc: " Floris Bos
@ 2015-02-15 12:33 ` Floris Bos
2015-03-20 23:23 ` Yann E. MORIN
2015-03-20 23:11 ` [Buildroot] [PATCH 1/5] kconfig-package: add support for " Yann E. MORIN
2015-03-20 23:14 ` Yann E. MORIN
5 siblings, 1 reply; 15+ messages in thread
From: Floris Bos @ 2015-02-15 12:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
---
boot/barebox/Config.in | 6 ++++++
boot/barebox/barebox.mk | 1 +
2 files changed, 7 insertions(+)
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 48431bd..64e3196 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -91,6 +91,12 @@ config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE
help
Path to the barebox configuration file
+config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES
+ string "Additional configuration fragment files"
+ help
+ A space-seperated list of configuration fragment files,
+ that will be merged to the main Barebox configuration file.
+
config BR2_TARGET_BAREBOX_BAREBOXENV
bool "bareboxenv tool in target"
help
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index b829ae7..41f487b 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -59,6 +59,7 @@ BAREBOX_SOURCE_CONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE))
endif
BAREBOX_KCONFIG_FILE = $(BAREBOX_SOURCE_CONFIG)
+BAREBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES))
BAREBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
BAREBOX_KCONFIG_OPTS = $(BAREBOX_MAKE_FLAGS)
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 5/5] barebox: add option to specify config fragments
2015-02-15 12:33 ` [Buildroot] [PATCH 5/5] barebox: " Floris Bos
@ 2015-03-20 23:23 ` Yann E. MORIN
0 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2015-03-20 23:23 UTC (permalink / raw)
To: buildroot
Floris, All,
On 2015-02-15 13:33 +0100, Floris Bos spake thusly:
> Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
> ---
> boot/barebox/Config.in | 6 ++++++
> boot/barebox/barebox.mk | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
> index 48431bd..64e3196 100644
> --- a/boot/barebox/Config.in
> +++ b/boot/barebox/Config.in
> @@ -91,6 +91,12 @@ config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE
> help
> Path to the barebox configuration file
>
> +config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES
> + string "Additional configuration fragment files"
> + help
> + A space-seperated list of configuration fragment files,
separated (lotta copy-paste, eh?)
Otherwise, OK:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> + that will be merged to the main Barebox configuration file.
> +
> config BR2_TARGET_BAREBOX_BAREBOXENV
> bool "bareboxenv tool in target"
> help
> diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
> index b829ae7..41f487b 100644
> --- a/boot/barebox/barebox.mk
> +++ b/boot/barebox/barebox.mk
> @@ -59,6 +59,7 @@ BAREBOX_SOURCE_CONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE))
> endif
>
> BAREBOX_KCONFIG_FILE = $(BAREBOX_SOURCE_CONFIG)
> +BAREBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES))
> BAREBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
> BAREBOX_KCONFIG_OPTS = $(BAREBOX_MAKE_FLAGS)
>
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments
2015-02-15 12:33 [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments Floris Bos
` (3 preceding siblings ...)
2015-02-15 12:33 ` [Buildroot] [PATCH 5/5] barebox: " Floris Bos
@ 2015-03-20 23:11 ` Yann E. MORIN
2015-03-21 14:57 ` Arnout Vandecappelle
2015-03-20 23:14 ` Yann E. MORIN
5 siblings, 1 reply; 15+ messages in thread
From: Yann E. MORIN @ 2015-03-20 23:11 UTC (permalink / raw)
To: buildroot
Floris, All,
On 2015-02-15 13:33 +0100, Floris Bos spake thusly:
> Adds functionality to the kconfig infrastructure to merge additional
> configuration fragment files to the main configuration file of
> kconfig packages, using support/kconfig/merge_config.sh
>
> Typical use-case is when you want your configuration to be
> kept in sync with an upstream (def)config file, but do require
> some minor local modifications.
>
> Disables -update-config and -update-defconfig targets when
> fragment files are set.
>
> Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
> ---
> package/pkg-kconfig.mk | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> index 04ac37d..18eee76 100644
> --- a/package/pkg-kconfig.mk
> +++ b/package/pkg-kconfig.mk
> @@ -35,6 +35,7 @@ $(call inner-generic-package,$(1),$(2),$(3),$(4))
> $(2)_KCONFIG_EDITORS ?= menuconfig
> $(2)_KCONFIG_OPTS ?=
> $(2)_KCONFIG_FIXUP_CMDS ?=
> +$(2)_KCONFIG_FRAGMENT_FILES ?=
>
> # FOO_KCONFIG_FILE is required
> ifndef $(2)_KCONFIG_FILE
> @@ -45,13 +46,14 @@ endif
> # be extracted (and patched) first
> $$($(2)_KCONFIG_FILE): | $(1)-patch
>
> -# The .config file is obtained by copying it from the specified source
> -# configuration file, after the package has been patched.
> +# The specified source configuration file and any additional configuration file
> +# fragments are merged together to .config, after the package has been patched.
> # Since the file could be a defconfig file it needs to be expanded to a
> # full .config first. We use 'make oldconfig' because this can be safely
> # done even when the package does not support defconfigs.
> -$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE)
> - $$(INSTALL) -m 0644 $$($(2)_KCONFIG_FILE) $$($(2)_DIR)/.config
> +$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
> + support/kconfig/merge_config.sh -m -O $$(@D) \
> + $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
> @yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
> $$($(2)_KCONFIG_OPTS) oldconfig
>
> @@ -87,6 +89,8 @@ $(1)-savedefconfig: $$($(2)_DIR)/.stamp_kconfig_fixup_done
> # Even though we could use 'cp --preserve-timestamps' here, the separate
> # cp and 'touch --reference' is used for symmetry with $(1)-update-defconfig.
> $(1)-update-config: $$($(2)_DIR)/.stamp_kconfig_fixup_done
> + $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
> + $$(error Unable to perform $(1)-update-config when fragment files are set))
$(error ...) is Makefile syntax, while this is a shell. I'd prefer we
use a shell construct here, like:
$$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
echo "Unable to perform $(1)-update-config when fragment files are set"; exit 1)
> cp -f $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
> touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
>
> @@ -95,6 +99,8 @@ $(1)-update-config: $$($(2)_DIR)/.stamp_kconfig_fixup_done
> # $(1)-update-config, the reference for 'touch' is _not_ the file from which
> # we copy.
> $(1)-update-defconfig: $(1)-savedefconfig
> + $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
> + $$(error Unable to perform $(1)-update-defconfig when fragment files are set))
Ditto.
Otherwise, looks good.
Regards,
Yann E. MORIN.
> cp -f $$($(2)_DIR)/defconfig $$($(2)_KCONFIG_FILE)
> touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
>
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments
2015-03-20 23:11 ` [Buildroot] [PATCH 1/5] kconfig-package: add support for " Yann E. MORIN
@ 2015-03-21 14:57 ` Arnout Vandecappelle
2015-03-23 8:09 ` Jeremy Rosen
0 siblings, 1 reply; 15+ messages in thread
From: Arnout Vandecappelle @ 2015-03-21 14:57 UTC (permalink / raw)
To: buildroot
On 21/03/15 00:11, Yann E. MORIN wrote:
> Floris, All,
>
> On 2015-02-15 13:33 +0100, Floris Bos spake thusly:
>> Adds functionality to the kconfig infrastructure to merge additional
>> configuration fragment files to the main configuration file of
>> kconfig packages, using support/kconfig/merge_config.sh
>>
>> Typical use-case is when you want your configuration to be
>> kept in sync with an upstream (def)config file, but do require
>> some minor local modifications.
>>
>> Disables -update-config and -update-defconfig targets when
>> fragment files are set.
>>
>> Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
>> ---
[snip]
>> @@ -87,6 +89,8 @@ $(1)-savedefconfig: $$($(2)_DIR)/.stamp_kconfig_fixup_done
>> # Even though we could use 'cp --preserve-timestamps' here, the separate
>> # cp and 'touch --reference' is used for symmetry with $(1)-update-defconfig.
>> $(1)-update-config: $$($(2)_DIR)/.stamp_kconfig_fixup_done
>> + $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
>> + $$(error Unable to perform $(1)-update-config when fragment files are set))
>
> $(error ...) is Makefile syntax, while this is a shell. I'd prefer we
> use a shell construct here, like:
>
> $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
> echo "Unable to perform $(1)-update-config when fragment files are set"; exit 1)
Or perhaps it's better to simply disable the update targets when fragments are set:
# Cannot update (def)config with fragments
ifneq ($$($(2)_KCONFIG_FRAGMENT_FILES),)
$(1)-update-config: ...
...
endif
[snip]
--
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments
2015-03-21 14:57 ` Arnout Vandecappelle
@ 2015-03-23 8:09 ` Jeremy Rosen
2015-03-23 18:31 ` Yann E. MORIN
0 siblings, 1 reply; 15+ messages in thread
From: Jeremy Rosen @ 2015-03-23 8:09 UTC (permalink / raw)
To: buildroot
----- Mail original -----
> On 21/03/15 00:11, Yann E. MORIN wrote:
> > Floris, All,
> >
[...]
> > use a shell construct here, like:
> >
> > $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
> > echo "Unable to perform $(1)-update-config when fragment
> > files are set"; exit 1)
>
> Or perhaps it's better to simply disable the update targets when
> fragments are set:
>
> # Cannot update (def)config with fragments
> ifneq ($$($(2)_KCONFIG_FRAGMENT_FILES),)
> $(1)-update-config: ...
> ...
> endif
>
> [snip]
>
I'm not sure... we are in a case where the user knows that the target
is supposed to exist. an unknown target message would be more
confusing than the OP's proposed error message. I would not be
suprised if someone reported the missing target as a bug here...
>
> --
> 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 at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments
2015-03-23 8:09 ` Jeremy Rosen
@ 2015-03-23 18:31 ` Yann E. MORIN
2015-03-23 21:41 ` Arnout Vandecappelle
0 siblings, 1 reply; 15+ messages in thread
From: Yann E. MORIN @ 2015-03-23 18:31 UTC (permalink / raw)
To: buildroot
J?r?my, All,
On 2015-03-23 09:09 +0100, Jeremy Rosen spake thusly:
> ----- Mail original -----
> > On 21/03/15 00:11, Yann E. MORIN wrote:
> > > Floris, All,
> > >
> [...]
> > > use a shell construct here, like:
> > >
> > > $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
> > > echo "Unable to perform $(1)-update-config when fragment
> > > files are set"; exit 1)
> >
> > Or perhaps it's better to simply disable the update targets when
> > fragments are set:
> >
> > # Cannot update (def)config with fragments
> > ifneq ($$($(2)_KCONFIG_FRAGMENT_FILES),)
> > $(1)-update-config: ...
> > ...
> > endif
> >
> > [snip]
>
> I'm not sure... we are in a case where the user knows that the target
> is supposed to exist. an unknown target message would be more
> confusing than the OP's proposed error message. I would not be
> suprised if someone reported the missing target as a bug here...
Agred, But I guess that what Arnout suggested would be something like:
$(1)-update-config:
ifneq ($$($(2)_KCONFIG_FRAGMENT_FILES),)
...
else
echo ERROR.
enfi
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments
2015-03-23 18:31 ` Yann E. MORIN
@ 2015-03-23 21:41 ` Arnout Vandecappelle
0 siblings, 0 replies; 15+ messages in thread
From: Arnout Vandecappelle @ 2015-03-23 21:41 UTC (permalink / raw)
To: buildroot
On 23/03/15 19:31, Yann E. MORIN wrote:
> J?r?my, All,
>
> On 2015-03-23 09:09 +0100, Jeremy Rosen spake thusly:
>> ----- Mail original -----
>>> On 21/03/15 00:11, Yann E. MORIN wrote:
>>>> Floris, All,
>>>>
>> [...]
>>>> use a shell construct here, like:
>>>>
>>>> $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
>>>> echo "Unable to perform $(1)-update-config when fragment
>>>> files are set"; exit 1)
>>>
>>> Or perhaps it's better to simply disable the update targets when
>>> fragments are set:
>>>
>>> # Cannot update (def)config with fragments
>>> ifneq ($$($(2)_KCONFIG_FRAGMENT_FILES),)
>>> $(1)-update-config: ...
>>> ...
>>> endif
>>>
>>> [snip]
>>
>> I'm not sure... we are in a case where the user knows that the target
>> is supposed to exist. an unknown target message would be more
>> confusing than the OP's proposed error message. I would not be
>> suprised if someone reported the missing target as a bug here...
>
> Agred, But I guess that what Arnout suggested would be something like:
>
> $(1)-update-config:
> ifneq ($$($(2)_KCONFIG_FRAGMENT_FILES),)
> ...
> else
> echo ERROR.
> enfi
Actually I did mean what I said, but I also agree with Jeremy that it could be
confusing. So +1 to Yann's suggestion.
Regards,
Arnout
--
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments
2015-02-15 12:33 [Buildroot] [PATCH 1/5] kconfig-package: add support for config fragments Floris Bos
` (4 preceding siblings ...)
2015-03-20 23:11 ` [Buildroot] [PATCH 1/5] kconfig-package: add support for " Yann E. MORIN
@ 2015-03-20 23:14 ` Yann E. MORIN
5 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2015-03-20 23:14 UTC (permalink / raw)
To: buildroot
Floris, All,
On 2015-02-15 13:33 +0100, Floris Bos spake thusly:
> Adds functionality to the kconfig infrastructure to merge additional
> configuration fragment files to the main configuration file of
> kconfig packages, using support/kconfig/merge_config.sh
>
> Typical use-case is when you want your configuration to be
> kept in sync with an upstream (def)config file, but do require
> some minor local modifications.
>
> Disables -update-config and -update-defconfig targets when
> fragment files are set.
BTW, you forgot to document that in the manual, see:
docs/manual/adding-packages-kconfig.txt
Regards,
Yann E. MORIN.
> Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
> ---
> package/pkg-kconfig.mk | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> index 04ac37d..18eee76 100644
> --- a/package/pkg-kconfig.mk
> +++ b/package/pkg-kconfig.mk
> @@ -35,6 +35,7 @@ $(call inner-generic-package,$(1),$(2),$(3),$(4))
> $(2)_KCONFIG_EDITORS ?= menuconfig
> $(2)_KCONFIG_OPTS ?=
> $(2)_KCONFIG_FIXUP_CMDS ?=
> +$(2)_KCONFIG_FRAGMENT_FILES ?=
>
> # FOO_KCONFIG_FILE is required
> ifndef $(2)_KCONFIG_FILE
> @@ -45,13 +46,14 @@ endif
> # be extracted (and patched) first
> $$($(2)_KCONFIG_FILE): | $(1)-patch
>
> -# The .config file is obtained by copying it from the specified source
> -# configuration file, after the package has been patched.
> +# The specified source configuration file and any additional configuration file
> +# fragments are merged together to .config, after the package has been patched.
> # Since the file could be a defconfig file it needs to be expanded to a
> # full .config first. We use 'make oldconfig' because this can be safely
> # done even when the package does not support defconfigs.
> -$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE)
> - $$(INSTALL) -m 0644 $$($(2)_KCONFIG_FILE) $$($(2)_DIR)/.config
> +$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
> + support/kconfig/merge_config.sh -m -O $$(@D) \
> + $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
> @yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
> $$($(2)_KCONFIG_OPTS) oldconfig
>
> @@ -87,6 +89,8 @@ $(1)-savedefconfig: $$($(2)_DIR)/.stamp_kconfig_fixup_done
> # Even though we could use 'cp --preserve-timestamps' here, the separate
> # cp and 'touch --reference' is used for symmetry with $(1)-update-defconfig.
> $(1)-update-config: $$($(2)_DIR)/.stamp_kconfig_fixup_done
> + $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
> + $$(error Unable to perform $(1)-update-config when fragment files are set))
> cp -f $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
> touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
>
> @@ -95,6 +99,8 @@ $(1)-update-config: $$($(2)_DIR)/.stamp_kconfig_fixup_done
> # $(1)-update-config, the reference for 'touch' is _not_ the file from which
> # we copy.
> $(1)-update-defconfig: $(1)-savedefconfig
> + $$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \
> + $$(error Unable to perform $(1)-update-defconfig when fragment files are set))
> cp -f $$($(2)_DIR)/defconfig $$($(2)_KCONFIG_FILE)
> touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
>
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 15+ messages in thread