Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp676826ybe; Mon, 2 Sep 2019 07:33:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAs+n2D4lUmaNK2/QE26KjzFkXzSmZ9fksdEVC+4ikpI/gITvCbzF9Vo4NFHL2n676AQvz X-Received: by 2002:a63:724f:: with SMTP id c15mr26180360pgn.257.1567434792406; Mon, 02 Sep 2019 07:33:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567434792; cv=none; d=google.com; s=arc-20160816; b=VoybUeXHpqxrSFaz4/2+DtaPc+5b1+IFkdllOHfDpu1PicTHsLFORkxo7KWVO/AQ5J 6h07T4TZDnWYEp4X5UvDZqKbPDGuTjaALzlrNGMycbb0IW2lKQTMgoMO8rX3sZtG1lGn kkeLkh2ZqhCwBzWuOIqcyo6lSTLBnnE0U8K7MlGzctHBb7+cya7xV3lRqW5RFAQtc6XJ sZTzpMXC0tbWEV5/fLkkLTYFlrgObX495mjAPA1nea+/w15Xuk0bvcMB8vVj9T+OKOzN AgQcb98CVCrYZ+OcoMiufVXXTGmchI69XUZ9ogfFsJ0sgHJsJk8q1q9FXCWRjYifVNZI Js7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=KH9Jg3M4ifqInqwXdTh4WMqj4GdLJCQtwJZ2nFakiLk=; b=qj1SQ+J7mU7Y6KUboREIdYpiDXWvXNO2HHCdpZhlI0rQvJXb4Dvcp9/d/Prs7MDexL 8hUtZMShIWmm58PCbGWw8Z97QVirE19OUWCELS/Z0pXFj0Yeiiagkvjx83kJrnZrVCX5 LmKSP76LMDahScjBxoDd6DRKnk1Rr1f6DM5kif1ZlkwebHvnnX/sKTAogpLb+F3w7vFj lDFqPOQl49IVS3aDg9V3R+ce1vsegE6PAGR/Ew7P9+XVE/11Gqy0vmBVqeC45mAzSNuC wzxrwloPx5dp6szL+YN4Ukk8wBTZGqaji+7bYvh7qHKVnt4CRuFPvj86Sjzt6vaU+jr2 1pGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=nbvNbHK+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a10si3383134pfi.280.2019.09.02.07.32.57; Mon, 02 Sep 2019 07:33:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=nbvNbHK+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731552AbfIBOcI (ORCPT + 99 others); Mon, 2 Sep 2019 10:32:08 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:19936 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726436AbfIBOcI (ORCPT ); Mon, 2 Sep 2019 10:32:08 -0400 Received: from hqpgpgate102.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:32:09 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Mon, 02 Sep 2019 07:32:07 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Mon, 02 Sep 2019 07:32: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:32:05 +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:32: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: HQMAIL105.nvidia.com (172.20.187.12) 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=1567434730; bh=KH9Jg3M4ifqInqwXdTh4WMqj4GdLJCQtwJZ2nFakiLk=; 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=nbvNbHK+H84R9pSM/bXkyEQBRQxobWUnJFhvMvAXgINOARFE/gMxTjb4IQD/ZoEyf HGWWJoU7K5Du710yBn6r0fV5bNSXdfI56+vD5W/7l1yPSNNj8lKejf/mwYiv0KpxTG v1IOdMQadAcjOzjnYeIVUOW3oZUvldjI56Xqc+wRx2gmMV/FQK/9aJHm/JjQMdnBf3 7Sn4B3o73RbEbvoC8P1gH12c1Q44eLh//U+KrsHjCiA8Vvx3kZlfCJsGt4l4tqUD7V nb9MfDfxlsCP5SUhTWaGbMZMvyXT+opXMlkWfsT7fKUc8A9ViVWuO0oxcj1mLFW5zD bP115hP+AsBWA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/09/2019 15:26, Guillaume Tucker wrote: > On 02/09/2019 15:21, Jon Hunter wrote: >> >> 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'? > > I just explained why I used "echo" on your thread. Essentially, > I think both can be used but "echo" made more sense to me because > the script is then using the output string from the command > rather than the exit status. Yes just saw that. However, I don't think that using 'echo' is necessary. The grep command does not output anything and so the variable will essentially be an empty string, we just need to ensure that no error is returned from the command. In cases such as these I always use 'true' in conjunction with grep. Cheers Jon -- nvpublic