* [Buildroot] [PATCH RFC] pkg-kconfig: support alternative .config location
@ 2016-09-11 17:07 Eric Le Bihan
2016-09-11 17:34 ` Yann E. MORIN
0 siblings, 1 reply; 5+ messages in thread
From: Eric Le Bihan @ 2016-09-11 17:07 UTC (permalink / raw)
To: buildroot
Kconfig clones, such as openconf used by xvisor [1], do not look for .config
at the root of the build directory, but in a subdirectory (e.g.
build/openconf).
This patch introduces a new Makefile variable named
$(2)_KCONFIG_BUILD_FILE, which defaults to $$($(2)_DIR)/.config and can
be overridden in the package Makefile.
This allows the use of the kconfig-package infrastructure with packages
relying on such clones.
[1] https://github.com/xvisor/xvisor/tree/master/tools/openconf
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
package/pkg-kconfig.mk | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index b0f5178..82561de 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -36,6 +36,7 @@ $(2)_KCONFIG_EDITORS ?= menuconfig
$(2)_KCONFIG_OPTS ?=
$(2)_KCONFIG_FIXUP_CMDS ?=
$(2)_KCONFIG_FRAGMENT_FILES ?=
+$(2)_KCONFIG_BUILD_FILE ?= $$($(2)_DIR)/.config
# The config file as well as the fragments could be in-tree, so before
# depending on them the package should be extracted (and patched) first.
@@ -91,9 +92,10 @@ endef
# 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.
-$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
+$$($(2)_KCONFIG_BUILD_FILE): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
$$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \
$$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \
+ mkdir -p $$(dir $$(@)); \
cp $$($(2)_KCONFIG_FILE) $$(@))
$$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \
$$(@) $$($(2)_KCONFIG_FRAGMENT_FILES)
@@ -102,7 +104,7 @@ $$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
# If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is
# already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add
# it explicitly. It doesn't hurt to always have it though.
-$$($(2)_DIR)/.config: | $(1)-patch
+$$($(2)_KCONFIG_BUILD_FILE): | $(1)-patch
# In order to get a usable, consistent configuration, some fixup may be needed.
# The exact rules are specified by the package .mk file.
@@ -112,7 +114,7 @@ define $(2)_FIXUP_DOT_CONFIG
$$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
endef
-$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config
+$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_KCONFIG_BUILD_FILE)
$$($(2)_FIXUP_DOT_CONFIG)
# Before running configure, the configuration file should be present and fixed
@@ -202,8 +204,8 @@ $(1)-update-config: $(1)-check-configuration-done
echo "Unable to perform $(1)-update-config when fragment files are set"; exit 1)
@$$(if $$($(2)_KCONFIG_DEFCONFIG), \
echo "Unable to perform $(1)-update-config when using a defconfig rule"; exit 1)
- cp -f $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
- touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
+ cp -f $$($(2)_KCONFIG_BUILD_FILE) $$($(2)_KCONFIG_FILE)
+ touch --reference $$($(2)_KCONFIG_BUILD_FILE) $$($(2)_KCONFIG_FILE)
# Note: make sure the timestamp of the stored configuration is not newer than
# the .config to avoid a useless rebuild. Note that, contrary to
@@ -215,7 +217,7 @@ $(1)-update-defconfig: $(1)-savedefconfig
@$$(if $$($(2)_KCONFIG_DEFCONFIG), \
echo "Unable to perform $(1)-update-defconfig when using a defconfig rule"; exit 1)
cp -f $$($(2)_DIR)/defconfig $$($(2)_KCONFIG_FILE)
- touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
+ touch --reference $$($(2)_KCONFIG_BUILD_FILE) $$($(2)_KCONFIG_FILE)
endif # package enabled
--
2.4.11
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH RFC] pkg-kconfig: support alternative .config location
2016-09-11 17:07 [Buildroot] [PATCH RFC] pkg-kconfig: support alternative .config location Eric Le Bihan
@ 2016-09-11 17:34 ` Yann E. MORIN
2016-09-11 18:07 ` Eric Le Bihan
0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2016-09-11 17:34 UTC (permalink / raw)
To: buildroot
?ric, All,
On 2016-09-11 19:07 +0200, Eric Le Bihan spake thusly:
> Kconfig clones, such as openconf used by xvisor [1], do not look for .config
> at the root of the build directory, but in a subdirectory (e.g.
> build/openconf).
>
> This patch introduces a new Makefile variable named
> $(2)_KCONFIG_BUILD_FILE, which defaults to $$($(2)_DIR)/.config and can
> be overridden in the package Makefile.
>
> This allows the use of the kconfig-package infrastructure with packages
> relying on such clones.
>
> [1] https://github.com/xvisor/xvisor/tree/master/tools/openconf
>
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> ---
> package/pkg-kconfig.mk | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> index b0f5178..82561de 100644
> --- a/package/pkg-kconfig.mk
> +++ b/package/pkg-kconfig.mk
> @@ -36,6 +36,7 @@ $(2)_KCONFIG_EDITORS ?= menuconfig
> $(2)_KCONFIG_OPTS ?=
> $(2)_KCONFIG_FIXUP_CMDS ?=
> $(2)_KCONFIG_FRAGMENT_FILES ?=
> +$(2)_KCONFIG_BUILD_FILE ?= $$($(2)_DIR)/.config
I think it would be better to name the variable $(2)_KCONFIG_DOTCONFIG_FILE
or maybe just $(2)_KCONFIG_DOTCONFIG.
Otherwise, the rest of the patch is a mere search-and-replace, so looks
pretty OK.
However, I don't see the point in having that in Buildroot without an
actuall package that uses that. Do you plan in sending such a package
(like xvisor)?
Regards,
Yann E. MORIN.
> # The config file as well as the fragments could be in-tree, so before
> # depending on them the package should be extracted (and patched) first.
> @@ -91,9 +92,10 @@ endef
> # 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.
> -$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
> +$$($(2)_KCONFIG_BUILD_FILE): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
> $$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \
> $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \
> + mkdir -p $$(dir $$(@)); \
> cp $$($(2)_KCONFIG_FILE) $$(@))
> $$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \
> $$(@) $$($(2)_KCONFIG_FRAGMENT_FILES)
> @@ -102,7 +104,7 @@ $$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
> # If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is
> # already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add
> # it explicitly. It doesn't hurt to always have it though.
> -$$($(2)_DIR)/.config: | $(1)-patch
> +$$($(2)_KCONFIG_BUILD_FILE): | $(1)-patch
>
> # In order to get a usable, consistent configuration, some fixup may be needed.
> # The exact rules are specified by the package .mk file.
> @@ -112,7 +114,7 @@ define $(2)_FIXUP_DOT_CONFIG
> $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
> endef
>
> -$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config
> +$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_KCONFIG_BUILD_FILE)
> $$($(2)_FIXUP_DOT_CONFIG)
>
> # Before running configure, the configuration file should be present and fixed
> @@ -202,8 +204,8 @@ $(1)-update-config: $(1)-check-configuration-done
> echo "Unable to perform $(1)-update-config when fragment files are set"; exit 1)
> @$$(if $$($(2)_KCONFIG_DEFCONFIG), \
> echo "Unable to perform $(1)-update-config when using a defconfig rule"; exit 1)
> - cp -f $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
> - touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
> + cp -f $$($(2)_KCONFIG_BUILD_FILE) $$($(2)_KCONFIG_FILE)
> + touch --reference $$($(2)_KCONFIG_BUILD_FILE) $$($(2)_KCONFIG_FILE)
>
> # Note: make sure the timestamp of the stored configuration is not newer than
> # the .config to avoid a useless rebuild. Note that, contrary to
> @@ -215,7 +217,7 @@ $(1)-update-defconfig: $(1)-savedefconfig
> @$$(if $$($(2)_KCONFIG_DEFCONFIG), \
> echo "Unable to perform $(1)-update-defconfig when using a defconfig rule"; exit 1)
> cp -f $$($(2)_DIR)/defconfig $$($(2)_KCONFIG_FILE)
> - touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
> + touch --reference $$($(2)_KCONFIG_BUILD_FILE) $$($(2)_KCONFIG_FILE)
>
> endif # package enabled
>
> --
> 2.4.11
>
> _______________________________________________
> 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] 5+ messages in thread
* [Buildroot] [PATCH RFC] pkg-kconfig: support alternative .config location
2016-09-11 17:34 ` Yann E. MORIN
@ 2016-09-11 18:07 ` Eric Le Bihan
2016-09-11 18:11 ` Yann E. MORIN
0 siblings, 1 reply; 5+ messages in thread
From: Eric Le Bihan @ 2016-09-11 18:07 UTC (permalink / raw)
To: buildroot
Hi!
Le Sun, 11 Sep 2016 19:34:03 +0200,
"Yann E. MORIN" <yann.morin.1998@free.fr> a ?crit :
> On 2016-09-11 19:07 +0200, Eric Le Bihan spake thusly:
> > Kconfig clones, such as openconf used by xvisor [1], do not look
> > for .config at the root of the build directory, but in a
> > subdirectory (e.g. build/openconf).
> >
> > This patch introduces a new Makefile variable named
> > $(2)_KCONFIG_BUILD_FILE, which defaults to $$($(2)_DIR)/.config and
> > can be overridden in the package Makefile.
> >
> > This allows the use of the kconfig-package infrastructure with
> > packages relying on such clones.
> >
> > [1] https://github.com/xvisor/xvisor/tree/master/tools/openconf
> >
> > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> > ---
> > package/pkg-kconfig.mk | 14 ++++++++------
> > 1 file changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> > index b0f5178..82561de 100644
> > --- a/package/pkg-kconfig.mk
> > +++ b/package/pkg-kconfig.mk
> > @@ -36,6 +36,7 @@ $(2)_KCONFIG_EDITORS ?= menuconfig
> > $(2)_KCONFIG_OPTS ?=
> > $(2)_KCONFIG_FIXUP_CMDS ?=
> > $(2)_KCONFIG_FRAGMENT_FILES ?=
> > +$(2)_KCONFIG_BUILD_FILE ?= $$($(2)_DIR)/.config
>
> I think it would be better to name the variable
> $(2)_KCONFIG_DOTCONFIG_FILE or maybe just $(2)_KCONFIG_DOTCONFIG.
OK.
> Otherwise, the rest of the patch is a mere search-and-replace, so
> looks pretty OK.
>
> However, I don't see the point in having that in Buildroot without an
> actuall package that uses that. Do you plan in sending such a package
> (like xvisor)?
Yes, I will send a patch to add a xvisor package shortly.
Thanks for the review.
--
ELB
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH RFC] pkg-kconfig: support alternative .config location
2016-09-11 18:07 ` Eric Le Bihan
@ 2016-09-11 18:11 ` Yann E. MORIN
2016-09-11 21:15 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2016-09-11 18:11 UTC (permalink / raw)
To: buildroot
?ric, All,
On 2016-09-11 20:07 +0200, Eric Le Bihan spake thusly:
> Le Sun, 11 Sep 2016 19:34:03 +0200,
> "Yann E. MORIN" <yann.morin.1998@free.fr> a ?crit :
>
> > On 2016-09-11 19:07 +0200, Eric Le Bihan spake thusly:
> > > Kconfig clones, such as openconf used by xvisor [1], do not look
> > > for .config at the root of the build directory, but in a
> > > subdirectory (e.g. build/openconf).
> > >
> > > This patch introduces a new Makefile variable named
> > > $(2)_KCONFIG_BUILD_FILE, which defaults to $$($(2)_DIR)/.config and
> > > can be overridden in the package Makefile.
> > >
> > > This allows the use of the kconfig-package infrastructure with
> > > packages relying on such clones.
> > >
> > > [1] https://github.com/xvisor/xvisor/tree/master/tools/openconf
> > >
> > > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> > > ---
> > > package/pkg-kconfig.mk | 14 ++++++++------
> > > 1 file changed, 8 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> > > index b0f5178..82561de 100644
> > > --- a/package/pkg-kconfig.mk
> > > +++ b/package/pkg-kconfig.mk
> > > @@ -36,6 +36,7 @@ $(2)_KCONFIG_EDITORS ?= menuconfig
> > > $(2)_KCONFIG_OPTS ?=
> > > $(2)_KCONFIG_FIXUP_CMDS ?=
> > > $(2)_KCONFIG_FRAGMENT_FILES ?=
> > > +$(2)_KCONFIG_BUILD_FILE ?= $$($(2)_DIR)/.config
> >
> > I think it would be better to name the variable
> > $(2)_KCONFIG_DOTCONFIG_FILE or maybe just $(2)_KCONFIG_DOTCONFIG.
>
> OK.
Before changing the variable name, please a bit ofr others to comment.
> > Otherwise, the rest of the patch is a mere search-and-replace, so
> > looks pretty OK.
> >
> > However, I don't see the point in having that in Buildroot without an
> > actuall package that uses that. Do you plan in sending such a package
> > (like xvisor)?
>
> Yes, I will send a patch to add a xvisor package shortly.
Great! Can you make that a series: this patch followed by the xvisor one?
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] 5+ messages in thread
* [Buildroot] [PATCH RFC] pkg-kconfig: support alternative .config location
2016-09-11 18:11 ` Yann E. MORIN
@ 2016-09-11 21:15 ` Arnout Vandecappelle
0 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2016-09-11 21:15 UTC (permalink / raw)
To: buildroot
On 11-09-16 20:11, Yann E. MORIN wrote:
> ?ric, All,
>
> On 2016-09-11 20:07 +0200, Eric Le Bihan spake thusly:
>> Le Sun, 11 Sep 2016 19:34:03 +0200,
>> "Yann E. MORIN" <yann.morin.1998@free.fr> a ?crit :
>>
>>> On 2016-09-11 19:07 +0200, Eric Le Bihan spake thusly:
>>>> Kconfig clones, such as openconf used by xvisor [1], do not look
>>>> for .config at the root of the build directory, but in a
>>>> subdirectory (e.g. build/openconf).
>>>>
>>>> This patch introduces a new Makefile variable named
>>>> $(2)_KCONFIG_BUILD_FILE, which defaults to $$($(2)_DIR)/.config and
>>>> can be overridden in the package Makefile.
>>>>
>>>> This allows the use of the kconfig-package infrastructure with
>>>> packages relying on such clones.
>>>>
>>>> [1] https://github.com/xvisor/xvisor/tree/master/tools/openconf
>>>>
>>>> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
>>>> ---
>>>> package/pkg-kconfig.mk | 14 ++++++++------
>>>> 1 file changed, 8 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
>>>> index b0f5178..82561de 100644
>>>> --- a/package/pkg-kconfig.mk
>>>> +++ b/package/pkg-kconfig.mk
>>>> @@ -36,6 +36,7 @@ $(2)_KCONFIG_EDITORS ?= menuconfig
>>>> $(2)_KCONFIG_OPTS ?=
>>>> $(2)_KCONFIG_FIXUP_CMDS ?=
>>>> $(2)_KCONFIG_FRAGMENT_FILES ?=
>>>> +$(2)_KCONFIG_BUILD_FILE ?= $$($(2)_DIR)/.config
>>>
>>> I think it would be better to name the variable
>>> $(2)_KCONFIG_DOTCONFIG_FILE or maybe just $(2)_KCONFIG_DOTCONFIG.
>>
>> OK.
>
> Before changing the variable name, please a bit ofr others to comment.
I definitely agree with _DOTCONFIG. And the rest of the patch looks good to me
as well, at first sight.
Regards,
Arnout
>
>>> Otherwise, the rest of the patch is a mere search-and-replace, so
>>> looks pretty OK.
>>>
>>> However, I don't see the point in having that in Buildroot without an
>>> actuall package that uses that. Do you plan in sending such a package
>>> (like xvisor)?
>>
>> Yes, I will send a patch to add a xvisor package shortly.
>
> Great! Can you make that a series: this patch followed by the xvisor one?
>
> Regards,
> Yann E. MORIN.
>
>
--
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: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-11 21:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-11 17:07 [Buildroot] [PATCH RFC] pkg-kconfig: support alternative .config location Eric Le Bihan
2016-09-11 17:34 ` Yann E. MORIN
2016-09-11 18:07 ` Eric Le Bihan
2016-09-11 18:11 ` Yann E. MORIN
2016-09-11 21:15 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox