From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 1/3] merge_config.sh: Fix merging buildroot config files
Date: Fri, 23 Nov 2018 22:14:22 +0100 [thread overview]
Message-ID: <20181123211422.GE14050@scaer> (raw)
In-Reply-To: <20181114071156.10453-2-afshin.nasser@gmail.com>
Nasser, All,
On 2018-11-14 10:41 +0330, Nasser Afshin spake thusly:
> This patch allows us to define config prefix with CONFIG_ environment
> variable.
>
> By setting the proper config prefix, we will have proper 'redundant
> configuration warnings' when we use '-r -m' options.
>
> This is actually already in mainline for v4.20-rc1:
> 2cd3faf87d2d8f6123adf34741b9a7b98828a76f
> ("merge_config.sh: Allow to define config prefix")
>
> Signed-off-by: Nasser Afshin <afshin.nasser@gmail.com>
> Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> support/kconfig/merge_config.sh | 7 ++++-
> ...e_config.sh-Allow-to-define-config-prefix.patch | 31 ++++++++++++++++++++++
> support/kconfig/patches/series | 1 +
> 3 files changed, 38 insertions(+), 1 deletion(-)
> create mode 100644 support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
>
> diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh
> index 50de5114dc..404ca3864f 100755
> --- a/support/kconfig/merge_config.sh
> +++ b/support/kconfig/merge_config.sh
> @@ -34,12 +34,16 @@ usage() {
> echo " -r list redundant entries when merging fragments"
> echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
> echo " -e colon-separated list of br2-external trees to use (optional)"
> + echo
> + echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_
> + environment variable."
> }
>
> RUNMAKE=true
> ALLTARGET=alldefconfig
> WARNREDUN=false
> OUTPUT=.
> +CONFIG_PREFIX=${CONFIG_-CONFIG_}
>
> while true; do
> case $1 in
> @@ -105,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
> fi
>
> MERGE_LIST=$*
> -SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
> +SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
> +
> TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
>
> echo "Using $INITFILE as base"
> diff --git a/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch b/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
> new file mode 100644
> index 0000000000..645043b163
> --- /dev/null
> +++ b/support/kconfig/patches/20-merge_config.sh-Allow-to-define-config-prefix.patch
> @@ -0,0 +1,31 @@
> +Index: kconfig/merge_config.sh
> +===================================================================
> +--- kconfig.orig/merge_config.sh
> ++++ kconfig/merge_config.sh
> +@@ -34,12 +34,16 @@ usage() {
> + echo " -r list redundant entries when merging fragments"
> + echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
> + echo " -e colon-separated list of br2-external trees to use (optional)"
> ++ echo
> ++ echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_
> ++ environment variable."
> + }
> +
> + RUNMAKE=true
> + ALLTARGET=alldefconfig
> + WARNREDUN=false
> + OUTPUT=.
> ++CONFIG_PREFIX=${CONFIG_-CONFIG_}
> +
> + while true; do
> + case $1 in
> +@@ -105,7 +109,8 @@ if [ ! -r "$INITFILE" ]; then
> + fi
> +
> + MERGE_LIST=$*
> +-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
> ++SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)[= ].*/\2/p"
> ++
> + TMP_FILE=$(mktemp -t .tmp.config.XXXXXXXXXX)
> +
> + echo "Using $INITFILE as base"
> diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series
> index e136de7937..be8627db13 100644
> --- a/support/kconfig/patches/series
> +++ b/support/kconfig/patches/series
> @@ -8,3 +8,4 @@
> 17-backport-kecho.patch
> 18-merge-config.sh-create-temporary-files-in-tmp.patch
> 19-merge_config.sh-add-br2-external-support.patch
> +20-merge_config.sh-Allow-to-define-config-prefix.patch
> --
> 2.15.0
>
> _______________________________________________
> 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. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2018-11-23 21:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-14 7:11 [Buildroot] [PATCH v3 0/3] Fix merging configuration fragments Nasser Afshin
2018-11-14 7:11 ` [Buildroot] [PATCH v3 1/3] merge_config.sh: Fix merging buildroot config files Nasser Afshin
2018-11-23 21:14 ` Yann E. MORIN [this message]
2018-11-24 9:12 ` Thomas Petazzoni
2018-11-14 7:11 ` [Buildroot] [PATCH v3 2/3] test-pkg: Use the correct config prefix when merging Nasser Afshin
2018-11-14 7:17 ` Petr Vorel
2018-11-14 7:49 ` Nasser Afshin
2018-11-14 8:24 ` Arnout Vandecappelle
2018-11-14 8:29 ` Petr Vorel
2018-11-14 8:55 ` Nasser Afshin
2018-11-14 9:04 ` Nasser Afshin
2018-11-14 7:11 ` [Buildroot] [PATCH v3 3/3] merge_config.sh: Avoid false positive matches from comment lines Nasser Afshin
2018-11-23 21:16 ` Yann E. MORIN
2018-11-24 9:12 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2018-11-05 8:35 [Buildroot] [PATCH] merge_config.sh: Fix merging buildroot config files Petr Vorel
2018-11-13 13:44 ` [Buildroot] [PATCH v3 0/3] Fix merging configuration fragments Nasser Afshin
2018-11-13 13:44 ` [Buildroot] [PATCH v3 1/3] merge_config.sh: Fix merging buildroot config files Nasser Afshin
2018-11-13 18:35 ` Petr Vorel
2018-11-14 7:16 ` Nasser Afshin
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=20181123211422.GE14050@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox