From patchwork Fri Mar 8 05:49:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 159948 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp8308290jad; Thu, 7 Mar 2019 21:50:49 -0800 (PST) X-Google-Smtp-Source: APXvYqw0Xw0/SJ+toLyoIOG+alCHp7pmPGVz/P1e1FGFOD6Y1BX+t+ZAu7hVQ+ofYoqGg+qbdZdx X-Received: by 2002:a62:1212:: with SMTP id a18mr16609269pfj.177.1552024249586; Thu, 07 Mar 2019 21:50:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552024249; cv=none; d=google.com; s=arc-20160816; b=drSYQxI8axyuZUHvpDRCY0t3DqoABl0/ZROtGIYB/lSbjt/ikNDi2xjoweNqKqSy8P 1iJV+GyT6r3Uw3ot3p1vWQXSs3w6BR8ov6e5+UYGuykN+m90US5Nd6c0C5gpyW3mq6FT rs/4aVVBRfn/plUskZ9bS6iBgHuggv8iuH3/mHBQq21bLLdV1gj3eD5NkEISuEMSrckM wCtZ87WIKP0C+hsE9+JXQgrq/qcA9lx0udZTCjo/uhE2MCJ9F2NpZWPaw5/CdexfBGBJ 4vc7pWaoLUsWzFyuGGHQX3nWfP7shXIlhIUtgU/BfVz2LLtTSTXPN4tlPulqEKK1e56e Yq8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=WPaR9mGQS3i/ZN6TFjOnpo4V/zOzzCAsMlMHCSy8VCE=; b=vtNRSSuEeo9sAkBH7fsHbjZ7LLEx4PzLXpR9+sGXWxK2unJ2p7zIi/NLJBnigRns29 REvycPooNVX/p6n4wn1QvTlJT121FQtSC/JaX4zIpJfgJlBmvh4qASZeiEOnNmaL7Jl/ LWKWycGdFC72/LEGWiQDwx0oEKHOlkSerhKZI3Hhw2dt0oNoP58DIHBuQHnPg478lHEd fV+ixIigQVe8vuBPdiDlcHGEs2NKs9rsuGARUznl8WnVuPOmSUY1mlFJSZmE8ePpEqSh E2o8AXAtzlmi5NxiX0fJtL8ZBOW5p97wJkJjX5wwOupJg7YbprLjRaQxnmgAbifwQeZs G4MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=fPJwF0aE; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y70si5640566pgd.83.2019.03.07.21.50.49; Thu, 07 Mar 2019 21:50:49 -0800 (PST) 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=@nifty.com header.s=dec2015msa header.b=fPJwF0aE; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726364AbfCHFur (ORCPT + 31 others); Fri, 8 Mar 2019 00:50:47 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:49044 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725497AbfCHFuq (ORCPT ); Fri, 8 Mar 2019 00:50:46 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x285nUI8008836; Fri, 8 Mar 2019 14:49:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x285nUI8008836 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1552024171; bh=WPaR9mGQS3i/ZN6TFjOnpo4V/zOzzCAsMlMHCSy8VCE=; h=From:To:Cc:Subject:Date:From; b=fPJwF0aE65pNop3N6PFh+ozSJJEeBIXH0wzTvqq2nkXUT15t/CRbFPKKDzGNnsj4R bRzxzF4cCiKkUjRV+s3U7LJoomhjJ6T1BT7byLODIAjXuFZtZTta0AkXQ0ZL9kjRBm oriy1lxxANKhqRZeYdm4gQp7ul8bNnClr0ozHWJsQZF/k82GImNxjbd/Dyf/66GLFZ ROiW/XWWxNqN62bpu0OUD2U7hvI0vZtrVjiNcZkdqNif5dPQ2wocBxIHS5/v8N9M07 SdBKsqSKPAtz4ZnK69eN1ivnY2kYblL8OxRtsDOCYbp00KWR0x2DLNFqmeGyTjpohM lnK5H6ftCqe0g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Nicholas Piggin , Michael Forney , Sam Ravnborg , linux-kernel@vger.kernel.org, Palmer Dabbelt , Nicolas Pitre Subject: [PATCH] kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG} Date: Fri, 8 Mar 2019 14:49:10 +0900 Message-Id: <1552024150-9831-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As commit 423a8155facf ("kbuild: Fix reading of .config in link-vmlinux.sh") addressed, some shells fail to perform '.' if ${KCONFIG_CONFIG} does not contain a slash at all. Instead, we can source include/config/auto.conf, which obviously contain slashes, and we do not expect its file path overridden by a user. Perhaps, the performance might be slightly better since unset CONFIG options are stripped from include/config/auto.conf. scripts/setlocalversion already works this way. Signed-off-by: Masahiro Yamada --- scripts/adjust_autoksyms.sh | 9 +-------- scripts/link-vmlinux.sh | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) -- 2.7.4 diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 6e6d639..84bf6b5 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -39,14 +39,7 @@ case "$KBUILD_VERBOSE" in esac # We need access to CONFIG_ symbols -case "${KCONFIG_CONFIG}" in -*/*) - . "${KCONFIG_CONFIG}" - ;; -*) - # Force using a file from the current directory - . "./${KCONFIG_CONFIG}" -esac +. include/config/auto.conf # Generate a new ksym list file with symbols needed by the current # set of modules. diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index bc7f1fc..dc0e8c5 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -171,14 +171,7 @@ if [ "$1" = "clean" ]; then fi # We need access to CONFIG_ symbols -case "${KCONFIG_CONFIG}" in -*/*) - . "${KCONFIG_CONFIG}" - ;; -*) - # Force using a file from the current directory - . "./${KCONFIG_CONFIG}" -esac +. include/config/auto.conf # Update version info GEN .version