From patchwork Mon Aug 19 20:06:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 171659 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3450143ily; Mon, 19 Aug 2019 13:07:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2yFehbrBHykwGqoPsJRUduhUENbt2d6EuGBteHbu+yJV4m+xmiOFQxwGQT/MmMdMrbAA/ X-Received: by 2002:a17:902:6843:: with SMTP id f3mr22303210pln.97.1566245220107; Mon, 19 Aug 2019 13:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566245220; cv=none; d=google.com; s=arc-20160816; b=ZDFvKK4074cV7i40uzp0bDJ6ymx5yqE4ucpV69gkt3NEBXEizNd/hesXlpXvLiYgWf 52pHygqH+Us2euwWFUNyklRoIlF3NSWJy5W5PmQAXtMLedPJc+FGJ2zYeDZfNPXKAmYN mEROX/WS3z8XGSKh3XsgjAfkFqCCLJ+jZS8teFqgs8E4zr7kjqTaLQhS19PINCUt/rSC 3hvoI2xpHFE3lj/RUflvhL0U3as4GWhU1qfM+zJIyZjrbVZhlzqV8myUcY4xpKpWgq3f fOpaMYNsQOvLDvBQ91lYS5UQeW7FPedFrBmY0HzBiFlamvQGW1oO82YXpFneYSJ3F9kI A0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=FgIxKoIsQoXNZe/y1pySQAz1KVR8mwuWigj8Pby/9nU=; b=MkVv5s1tZLb5//cka4X2oFUvC36aS5XSCvDbhvjuANuvxBxAzFe6Xh5t530TGZNkLg bDYi3tbHROD/agbMt1IFFvr48bdc5bmPcKSSXR2ypyedJwUY01Z2rAPRsVonCTkNYbrk EvBUSrUxVwre5ejvkGXnrQ5RtCYGKU+em3shnR8YUh6vG0aU2kZisArJoZcbyCG049jM rAr2cfIZ/2V9Ky/U3ZWdmeYD4t/mSixua2212M42lqmZjVf5/wYY9QtLSOjOi2X9TOPF QCFEoSIeX3Pvv0Q3RBIwhZZSZiN0YEftvgSe/OqfINSM0Oho+L+7D0d06iRM7VwD9aVx eLwg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 14si10466051pga.452.2019.08.19.13.06.59; Mon, 19 Aug 2019 13:07:00 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728316AbfHSUG7 (ORCPT + 28 others); Mon, 19 Aug 2019 16:06:59 -0400 Received: from mail-wm1-f99.google.com ([209.85.128.99]:40084 "EHLO mail-wm1-f99.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727970AbfHSUG5 (ORCPT ); Mon, 19 Aug 2019 16:06:57 -0400 Received: by mail-wm1-f99.google.com with SMTP id v19so614946wmj.5 for ; Mon, 19 Aug 2019 13:06:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FgIxKoIsQoXNZe/y1pySQAz1KVR8mwuWigj8Pby/9nU=; b=NHG6epF1IAyH2r+GsLMCE+tp5j9K2MsCAfNX5i6JYqDtOwdrJALGOF/Hkg/YcFOiQ0 ZEyxWtGQa/qgR4ncsK9WM8FPOfW5Bqph3ez5gqAxfsnhFkklLtMw+vUB0evopaEkezm7 DT/CSOJHLpSrNPSBZ57XDG2kN69XBZJqj6fT3xjkcFG/4EqS9bhDKEZ3ZMrMez6ysiT8 r7uZ2WIzvcPS1gHw5vybwGikxPJoByY9iOufhXnTSASqPWWuggQR2YrkWMJyTJHGIAJG dSqG2aAgSNpvsvZTG16Tk2QPAjo8VYsqxFnRo1C5RHklA4PeG7sWDBU3aloFWEXrFKRw pk+A== X-Gm-Message-State: APjAAAW7VhOrwVYvSkzrAhMW0prgR/u6KZPPPePGMJcm28ejUFRsJG5T +uv7T3TuaRh2v9vD7+Xn9QMNPmNn8hNlfslD/ZQzB1yyhadjuS1fo15hkd0AKCq9qg== X-Received: by 2002:a1c:c1c1:: with SMTP id r184mr22036371wmf.9.1566245215772; Mon, 19 Aug 2019 13:06:55 -0700 (PDT) Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk. [2a01:7e01::f03c:91ff:fed4:a3b6]) by smtp-relay.gmail.com with ESMTPS id z7sm248136wrl.24.2019.08.19.13.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 13:06:55 -0700 (PDT) X-Relaying-Domain: sirena.org.uk Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1hznvb-0006eC-Hd; Mon, 19 Aug 2019 20:06:55 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 85D6F274314C; Mon, 19 Aug 2019 21:06:54 +0100 (BST) From: Mark Brown To: Masahiro Yamada , Guillaume Tucker Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown Subject: [PATCH v2] merge_config.sh: Check error codes from make Date: Mon, 19 Aug 2019 21:06:50 +0100 Message-Id: <20190819200650.18156-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When we execute make after merging the configurations we ignore any errors it produces causing whatever is running merge_config.sh to be unaware of any failures. This issue was noticed by Guillaume Tucker while looking at problems with testing of clang only builds in KernelCI which caused Kbuild to be unable to find a working host compiler. This implementation was suggested by Yamada-san. Suggested-by: Masahiro Yamada Reported-by: Guillaume Tucker Signed-off-by: Mark Brown --- scripts/kconfig/merge_config.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index d924c51d28b7..bec246719aea 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -13,12 +13,12 @@ # Copyright (c) 2009-2010 Wind River Systems, Inc. # Copyright 2011 Linaro +set -e + clean_up() { rm -f $TMP_FILE rm -f $MERGE_FILE - exit } -trap clean_up HUP INT TERM usage() { echo "Usage: $0 [OPTIONS] [CONFIG [...]]" @@ -110,6 +110,9 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) MERGE_FILE=$(mktemp ./.merge_tmp.config.XXXXXXXXXX) echo "Using $INITFILE as base" + +trap clean_up EXIT + cat $INITFILE > $TMP_FILE # Merge files, printing warnings on overridden values @@ -155,7 +158,6 @@ if [ "$RUNMAKE" = "false" ]; then echo "#" echo "# merged configuration written to $KCONFIG_CONFIG (needs make)" echo "#" - clean_up exit fi @@ -185,5 +187,3 @@ for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do echo "" fi done - -clean_up