Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Petr Vorel <petr.vorel@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3] merge_config.sh: merge also buildroot config files
Date: Thu, 25 Oct 2018 09:43:10 +0200	[thread overview]
Message-ID: <20181025074309.GB18528@dell5510> (raw)
In-Reply-To: <20181025022031.14043-1-afshin.nasser@gmail.com>

Hi Angelo,

> From: Angelo Compagnucci <angelo.compagnucci@gmail.com>

> This patch adds a way to merge buildroot config file programmatically.
> It adds an option (-b, buildroot mode) to manage buildroot config files.
> The buildroot mode changes the way the script looks for configurations
> entries using the BR2_ prefix and modify the call to the make command
> to be buildroot friendly.

> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
> Signed-off-by: Nasser Afshin <afshin.nasser@gmail.com>
Reviewed-by: Petr Vorel <pvorel@suse.cz>

LGTM. Could you please add commit where you actually use -b option?
I guess it should be in utils/test-pkg and support/kconfig/Makefile.
Not sure whether all packages using kconfig-package are using prefix CONFIG_,
but probably yes.

I'd suggest to move underscore to $SED_CONFIG_EXP. Or is it less intuitive?

> +CONFIG_PREFIX=CONFIG_
   CONFIG_PREFIX=CONFIG

>  while true; do
>  	case $1 in
> @@ -71,6 +73,11 @@ while true; do
>  		shift 2
>  		continue
>  		;;
> +	"-b")
> +		CONFIG_PREFIX=BR2_
		CONFIG_PREFIX=BR2

...
>  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"
   SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(${CONFIG_PREFIX}_[a-zA-Z0-9_]*\)[= ].*/\2/p"

BTW There is some mixed spaces and tabs (pwclient fixed that but bare that in
mind next time):
Description: [v3] merge_config.sh: merge also buildroot config files
Applying: merge_config.sh: merge also buildroot config files
.git/rebase-apply/patch:63: space before tab in indent.
 	echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
.git/rebase-apply/patch:64: space before tab in indent.
 	echo "  -h    display this help text"
.git/rebase-apply/patch:66: space before tab in indent.
 	echo "  -m    only merge the fragments, do not execute the make command"
.git/rebase-apply/patch:67: space before tab in indent.
 	echo "  -n    use allnoconfig instead of alldefconfig"
.git/rebase-apply/patch:68: space before tab in indent.
 	echo "  -r    list redundant entries when merging fragments"
warning: squelched 10 whitespace errors


Kind regards,
Petr

  parent reply	other threads:[~2018-10-25  7:43 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-19 22:58 [Buildroot] [PATCH] merge_config.sh: Fix finding redundant config mechanism Nasser
2018-10-20 14:56 ` Matthew Weber
2018-10-20 16:01   ` Arnout Vandecappelle
2018-10-21 17:27     ` Petr Vorel
2018-10-21 17:35       ` Matthew Weber
2018-10-21 17:46         ` Petr Vorel
2018-10-23 15:19     ` Nasser Afshin
2018-10-23 18:20       ` Arnout Vandecappelle
2018-10-24 19:15         ` Petr Vorel
2018-10-24 23:00           ` Nasser
2018-10-25  1:13         ` [Buildroot] [PATCH v2] merge_config.sh: merge also buildroot config files Nasser Afshin
2018-10-25  1:19           ` Nasser
2018-10-25  2:20           ` [Buildroot] [PATCH v3] " Nasser Afshin
2018-10-25  6:02             ` [Buildroot] Antwort: " Marcel Patzlaff
2018-10-25  7:43             ` Petr Vorel [this message]
2018-10-25  9:43               ` [Buildroot] Antwort: " Marcel Patzlaff
2018-10-25 21:43                 ` Petr Vorel
2018-10-26  6:03                   ` [Buildroot] Antwort: " Marcel Patzlaff
2018-10-26 23:05                     ` Nasser
2018-10-27  4:46                       ` Petr Vorel
2018-10-27 10:48                         ` Nasser Afshin
2018-10-31 19:35                           ` [Buildroot] " Petr Vorel
2018-10-31 20:38                             ` Nasser
2018-10-31 20:56                               ` Petr Vorel
2018-11-01  1:09                                 ` [Buildroot] [PATCH] merge_config.sh: Fix merging " Nasser Afshin
2018-11-01  3:51                                   ` yamada.masahiro at socionext.com
2018-11-01  5:49                                     ` Petr Vorel
2018-11-01  8:12                                       ` Nasser
2018-11-01  6:24                                   ` Petr Vorel
2018-11-01 10:55                                     ` Nasser
2018-11-01 12:05                                       ` Arnout Vandecappelle
2018-11-01 16:19                                         ` Petr Vorel
2018-11-02  2:12                                           ` Nasser
2018-11-02  7:55                                             ` yamada.masahiro at socionext.com
2018-11-02 10:05                                               ` Arnout Vandecappelle
2018-11-02 22:50                                                 ` Petr Vorel
2018-11-03 21:32                                                   ` Nasser
2018-11-05  8:23                                                     ` yamada.masahiro at socionext.com
2018-11-05  8:35                                                       ` 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
2018-11-13 13:44                                                           ` [Buildroot] [PATCH v3 2/3] test-pkg: Use the correct config prefix when merging Nasser Afshin
2018-11-13 18:26                                                             ` Petr Vorel
2018-11-13 13:44                                                           ` [Buildroot] [PATCH v3 3/3] merge_config.sh: Avoid false positive matches from comment lines Nasser Afshin
2018-11-13 18:38                                                             ` Petr Vorel
2018-11-14  7:18                                                           ` [Buildroot] [PATCH v3 0/3] Fix merging configuration fragments Nasser Afshin
2018-11-01 13:23                                       ` [Buildroot] [PATCH] merge_config.sh: Fix merging buildroot config files Petr Vorel
2018-11-02  2:18                                         ` Nasser
2018-10-29 15:46                     ` [Buildroot] Antwort: Re: Antwort: Re: [PATCH v3] merge_config.sh: merge also " Petr Vorel

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=20181025074309.GB18528@dell5510 \
    --to=petr.vorel@gmail.com \
    --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