From patchwork Mon Sep 26 04:05:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 76984 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp971365qgf; Sun, 25 Sep 2016 21:03:51 -0700 (PDT) X-Received: by 10.194.238.170 with SMTP id vl10mr16688744wjc.18.1474862631142; Sun, 25 Sep 2016 21:03:51 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id g139si6787708wme.92.2016.09.25.21.03.50; Sun, 25 Sep 2016 21:03:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A6DD8A76F6; Mon, 26 Sep 2016 06:03:47 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KG_omH_u2Nik; Mon, 26 Sep 2016 06:03:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8A03FA7764; Mon, 26 Sep 2016 06:03:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E7638A76F8 for ; Mon, 26 Sep 2016 06:03:33 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cjWs5Vf9YAZw for ; Mon, 26 Sep 2016 06:03:33 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by theia.denx.de (Postfix) with ESMTPS id 142E7A76DE for ; Mon, 26 Sep 2016 06:03:29 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id u8Q42tmH006107; Mon, 26 Sep 2016 13:02:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u8Q42tmH006107 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1474862579; bh=l+Zd1aHgNMtUAEtgimAUSplOqwKQUjisl9iGUgieVc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ne6sgRiDwiP0tWAf7mWTu00S1AXqkF2dIygHm+vs4dauR6TLDLVSNwO/p0uEUf+dG c3tqM8cxJ7J7f1Aaf743wzwXL5PC90KXYjdOgHS06sr0Lv+L6FhF8E7WnR3R9FS7km 2YnYY/L2VrbVmqBEGncaH1a9J8IC/9FG5DLay4tNJraWH3JiyzufpULDX15DF3GtB3 ss9kksg0e8G02YzjSXribRcX79IfL4vOdyTmn+XyTbk/eA08TLvbz4x+bB919nYzlF bB8v1DweCO48Bh+XqE+rtgY3T5oFEPoV8f7FpYzxJUSmDdoWt7I1UyDI6fm8WushuT EEqgKB4bpxD3A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 26 Sep 2016 13:05:02 +0900 Message-Id: <1474862702-16580-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474862702-16580-1-git-send-email-yamada.masahiro@socionext.com> References: <1474862702-16580-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini , Stephen Warren Subject: [U-Boot] [PATCH 5/5] check-config: allow to complete build even with ad-hoc CONFIG options X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Currently, the check-config.sh terminates the build when unknown ad-hoc options are detected. I think it is too much because we may want to patch config headers locally in a build/deployment project. So, let's relax check-config.sh to just warn even if it detects options that are not in the whitelist. Instead, this check can be done at the end of build, along with other checks. It will catch more attention. Even with this change, the Buildman tool catches new warnings, so Tom can give NACK to new ad-hoc options. Signed-off-by: Masahiro Yamada --- scripts/check-config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/scripts/check-config.sh b/scripts/check-config.sh index 6618dfb..9d2cfc6 100755 --- a/scripts/check-config.sh +++ b/scripts/check-config.sh @@ -37,14 +37,13 @@ cat `find ${srctree} -name "Kconfig*"` |sed -n \ -e 's/^menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' |sort |uniq > ${ok} comm -23 ${suspects} ${ok} >${new_adhoc} if [ -s ${new_adhoc} ]; then - echo "Error: You must add new CONFIG options using Kconfig" + echo "Warning: You must add new CONFIG options using Kconfig" echo "The following new ad-hoc CONFIG options were detected:" cat ${new_adhoc} echo echo "Please add these via Kconfig instead. Find a suitable Kconfig" echo "file and add a 'config' or 'menuconfig' option." # Don't delete the temporary files in case they are useful - exit 1 else rm ${suspects} ${ok} ${new_adhoc} fi