Message ID | 1445992931-28107-6-git-send-email-olof@lixom.net (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Oct 28, 2015 at 09:42:06AM +0900, Olof Johansson wrote: > Kconfig knows how to handle CONFIG_FOO=n just fine, but it'll always > use "# CONFIG FOO is not set" in the resulting config. Mangle the input > accordingly so we don't report this as a failure when it isn't. > > Signed-off-by: Olof Johansson <olof@lixom.net> Matching Kconfig behavior is the logical approach, no point in complaining if Kconfig will accpet the result. Bruce, I think we'll just need to update the linux-yocto tool documentation not to mark =n as wrong. Reviewed-by: Darren Hart <dvhart@linux.intel.com>
On 10/28/2015 02:26 AM, Darren Hart wrote: > On Wed, Oct 28, 2015 at 09:42:06AM +0900, Olof Johansson wrote: >> Kconfig knows how to handle CONFIG_FOO=n just fine, but it'll always >> use "# CONFIG FOO is not set" in the resulting config. Mangle the input >> accordingly so we don't report this as a failure when it isn't. >> >> Signed-off-by: Olof Johansson <olof@lixom.net> > > Matching Kconfig behavior is the logical approach, no point in complaining if > Kconfig will accpet the result. > > Bruce, I think we'll just need to update the linux-yocto tool documentation not > to mark =n as wrong. purists still think it is wrong :) The tools don't report this as an error anymore, so there's no change here. Bruce > > Reviewed-by: Darren Hart <dvhart@linux.intel.com> > -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index c244042..933f2d6 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -39,7 +39,7 @@ usage() { } getval() { - grep -w -e "$1" "$2" + grep -w -e "$1" "$2" | sed 's/^CONFIG_\(.*\)=n$/# CONFIG_\1 is not set/g' } CONF_IS_ERR=false
Kconfig knows how to handle CONFIG_FOO=n just fine, but it'll always use "# CONFIG FOO is not set" in the resulting config. Mangle the input accordingly so we don't report this as a failure when it isn't. Signed-off-by: Olof Johansson <olof@lixom.net> --- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)