| Message ID | 1445992931-28107-7-git-send-email-olof@lixom.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Oct 28, 2015 at 09:42:07AM +0900, Olof Johansson wrote: Needs a commit message here that says (I think): Avoid mangled error output by collecting only the last value. Warnings are still issued when overrides occur. Agreed on the change though. Reviewed-by: Darren Hart <dvhart@linux.intel.com> > Signed-off-by: Olof Johansson <olof@lixom.net> > --- > scripts/kconfig/merge_config.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh > index 933f2d6..1945b2c 100755 > --- a/scripts/kconfig/merge_config.sh > +++ b/scripts/kconfig/merge_config.sh > @@ -39,7 +39,7 @@ usage() { > } > > getval() { > - grep -w -e "$1" "$2" | sed 's/^CONFIG_\(.*\)=n$/# CONFIG_\1 is not set/g' > + grep -w -e "$1" "$2" | tail -1 | sed 's/^CONFIG_\(.*\)=n/# CONFIG_\1 is not set/g' > } > > CONF_IS_ERR=false > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ >
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 933f2d6..1945b2c 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -39,7 +39,7 @@ usage() { } getval() { - grep -w -e "$1" "$2" | sed 's/^CONFIG_\(.*\)=n$/# CONFIG_\1 is not set/g' + grep -w -e "$1" "$2" | tail -1 | sed 's/^CONFIG_\(.*\)=n/# CONFIG_\1 is not set/g' } CONF_IS_ERR=false
Signed-off-by: Olof Johansson <olof@lixom.net> --- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)