From: Arnout Vandecappelle <arnout@mind.be>
To: Christian Stewart <christian@paral.in>, buildroot@buildroot.org
Cc: "Yann E . MORIN" <yann.morin.1998@free.fr>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: Re: [Buildroot] [PATCH v2 1/1] package/pkg-utils: prevent kconfig_enable_opt from changing =m to =y
Date: Wed, 18 May 2022 20:01:41 +0200 [thread overview]
Message-ID: <4b7583c4-5d03-60bc-4b42-4b2f18177a78@mind.be> (raw)
In-Reply-To: <20220517103608.3455749-1-christian@paral.in>
On 17/05/2022 12:36, Christian Stewart via buildroot wrote:
> The KCONFIG_ENABLE_OPT is intended to enable a required kernel configuration
> option when a package requires it.
>
> However, this will often override an existing enabled module with `=m` with `=y`
> which overrides the module to be built-in instead of separate.
>
> This is undesirable behavior; we often want these as `=m` and not `=y` to reduce
> the size of the kernel image.
>
> This patch changes KCONFIG_MUNGE_DOT_CONFIG to prevent changing `=m` to `=y`.
Good catch!
Patch is a bit over-complicated, but I don't know how to do better.
>
> Signed-off-by: Christian Stewart <christian@paral.in>
>
> ---
>
> v1 -> v2:
>
> - fix indentation spacing: use tab instead of spaces
> - simplify by using $(1) instead of two separate variables
>
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
> package/pkg-utils.mk | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> index 7d1aea7710..218d6ea9b0 100644
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -21,8 +21,14 @@ KCONFIG_DOT_CONFIG = $(strip \
> )
>
> # KCONFIG_MUNGE_DOT_CONFIG (option, newline [, file])
> +# If setting to =y and the option is already set to =m, ignore.
> define KCONFIG_MUNGE_DOT_CONFIG
> - $(SED) "/\\<$(strip $(1))\\>/d" $(call KCONFIG_DOT_CONFIG,$(3))
> + if [[ "$(lastword $(subst =, ,$(strip $(2))))" == "y" ]]; then \
This part we could avoid by adding a 4th option and setting it only on
KCONFIG_ENABLE_OPT.
> + if grep -q "$(strip $(1))=m" $(call KCONFIG_DOT_CONFIG,$(3)); then \
> + exit 0; \
This is a kind of hard-to-follow control structure - better turn around the
condition and do the replacement inside it. So, combined with the above:
if $(if $(4),grep -q ...,true); then \
sed ...; \
echo ...; \
fi
Regards,
Arnout
> + fi; \
> + fi; \
> + $(SED) "/\\<$(strip $(1))\\>/d" $(call KCONFIG_DOT_CONFIG,$(3)); \
> echo '$(strip $(2))' >> $(call KCONFIG_DOT_CONFIG,$(3))
> endef
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-05-18 18:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 10:36 [Buildroot] [PATCH v2 1/1] package/pkg-utils: prevent kconfig_enable_opt from changing =m to =y Christian Stewart via buildroot
2022-05-18 18:01 ` Arnout Vandecappelle [this message]
2022-05-18 20:21 ` Yann E. MORIN
2022-05-23 11:53 ` TIAN Yuanhao
2022-07-23 22:13 ` Arnout Vandecappelle
2022-07-25 12:09 ` [Buildroot] [PATCH] package/pkg-utils: prevent KCONFIG_ENABLE_OPT " TIAN Yuanhao
2022-07-25 14:28 ` Yann E. MORIN
2022-07-25 15:03 ` Arnout Vandecappelle
2022-07-25 15:19 ` Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4b7583c4-5d03-60bc-4b42-4b2f18177a78@mind.be \
--to=arnout@mind.be \
--cc=buildroot@buildroot.org \
--cc=christian@paral.in \
--cc=thomas.petazzoni@bootlin.com \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.