From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A4C9C3A59E for ; Mon, 2 Sep 2019 14:21:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 020A921881 for ; Mon, 2 Sep 2019 14:21:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="YajbdzbS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731524AbfIBOVJ (ORCPT ); Mon, 2 Sep 2019 10:21:09 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:1409 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730237AbfIBOVI (ORCPT ); Mon, 2 Sep 2019 10:21:08 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 02 Sep 2019 07:21:10 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 02 Sep 2019 07:21:07 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 02 Sep 2019 07:21:07 -0700 Received: from [10.21.132.148] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 2 Sep 2019 14:21:06 +0000 Subject: Re: [PATCH 1/1] merge_config.sh: ignore unwanted grep errors To: Guillaume Tucker , Masahiro Yamada , Mark Brown CC: , , , linux-tegra References: <4f92e9b3a88e60c8b5962504d77bc596442b0a40.1567023309.git.guillaume.tucker@collabora.com> From: Jon Hunter Message-ID: Date: Mon, 2 Sep 2019 15:21:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1567434070; bh=d+3lnPHPBX264Bf1cBmGC7sI4oSJKlvQXa/cZ2KLhE0=; h=X-PGP-Universal:Subject:To:CC:References:From:Message-ID:Date: User-Agent:MIME-Version:In-Reply-To:X-Originating-IP: X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=YajbdzbS0avBPia8RuYQ7j+PVgkwHzYlKv+TgMa7Q336gF7cOk1vleDXAvXQ/rSwh pyucLH2Tx1r3ZulfC/2B8tqXvSRBcFtqol5NIpAPVAc7nMRqSrVx2WV1b/MPkeS6Js oHp1rQnKcnhVpe4Gi8stlj181gG9JUwDL6st6tTEPIwbwpS0i8DcwBaX7c4LdGrB7K WvwPsTN5KbyMXLp2t8f0YvpTYVyIjhVdt/KYWupCX5c5AQeIgpkTM3G6RBZw9pp/0Y LrQ48J8UHbFzjouHjX+NPsvoAmA8/X4m1zU3YUiP6UQ0lAjHhxknUN1rFLWjDHl2S2 eo8ZXA/ntwKkw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/09/2019 15:14, Guillaume Tucker wrote: > + Jon Hunter who hit a similar issue Thanks for adding me. > On 28/08/2019 21:19, Guillaume Tucker wrote: >> The merge_config.sh script verifies that all the config options have >> their expected value in the resulting file and prints any issues as >> warnings. These checks aren't intended to be treated as errors given >> the current implementation. However, since "set -e" was added, if the >> grep command to look for a config option does not find it the script >> will then abort prematurely. >> >> Handle the case where the grep exit status is non-zero by setting >> ACTUAL_VAL to an empty string to restore previous functionality. >> >> Fixes: cdfca821571d ("merge_config.sh: Check error codes from make") >> Signed-off-by: Guillaume Tucker >> --- >> 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 d924c51d28b7..d673268d414b 100755 >> --- a/scripts/kconfig/merge_config.sh >> +++ b/scripts/kconfig/merge_config.sh >> @@ -177,7 +177,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET >> for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do >> >> REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE) >> - ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG") >> + ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG" || echo) Shouldn't this just be 'true' instead of 'echo'? Cheers Jon -- nvpublic