From patchwork Fri Mar 8 09:56:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 159966 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp8505014jad; Fri, 8 Mar 2019 01:57:11 -0800 (PST) X-Google-Smtp-Source: APXvYqw0MEXOdK6/qAuHpoyqM19pixrr58BC2+wkdmcqBlv0m8LeqOKSozxqgIVuQJihc7xiZWYv X-Received: by 2002:a17:902:8b8b:: with SMTP id ay11mr18010948plb.162.1552039031070; Fri, 08 Mar 2019 01:57:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552039031; cv=none; d=google.com; s=arc-20160816; b=JZBiJk6YkoLKHFddJpwfxhKN18cfqxfznkffJyjFxJbQexq3d7yC2jEbuHoULs2Aor awaKi8wvZtgVDmTioFI4ByfUsvrDr+RaodEwLxD0//bPpxIjpNTIDoneYxGirTTdIhpU XvPeP4r92uKHoDvxNLscMHF98E0EoMxbRBMvgkBnMata4aM+uK/U2EZ+/uBSogOdgt9G lf7oJAqc4FHyZVJwVxk1xcFavgbS0xRa2ZtY9WD6fOWGg9CzU8emjBvIvaq4pxfRS8M3 6Q3ZuMJtm6LUE17CApvOxHMvFueKYzub87HVVvc27mA13q8KYk2I2Uc96ZELvFaqCmUu 0rMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=aGnH/xy3lfI4P4Pf0gopqcxOtRSY0Xj6FuRqiw7m0Ng=; b=VOb6MrQwf3nTlHuJD20m1oHSEEafKLVF9Yc3ygs8HunbKueHdpLujUIz1S+Ns0xLSE fXQxZzm1gJYU2M43pHf2vcIS4+cZUOdAvO4UfZZlH5EFg460KxwELoTFO5iBrroog4LP +2VUyCpQOpfHMPhMF60c6nDcAcMeNzYF+S8NeHSloHCr9ThkEBGO3Luh98+cBtPTgd2C zjJxYgQ/8p+HoFmyNawQOvL44i06JTpNBTkxDi4D7gIbdpdtf9K9xIUKGr18eEuA2kr9 JPd9YnwR2Z39V42+Sbyv7LAc/yGJ3gc+1HDiEcU1jQG8l/qqqOqc/LSlqdrQwEOxLUXb toSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=TSqeBJUJ; 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 o24si6139490pgh.114.2019.03.08.01.57.10; Fri, 08 Mar 2019 01:57:11 -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=TSqeBJUJ; 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 S1726428AbfCHJ5I (ORCPT + 31 others); Fri, 8 Mar 2019 04:57:08 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:58452 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726249AbfCHJ5E (ORCPT ); Fri, 8 Mar 2019 04:57:04 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id x289uSqc003883; Fri, 8 Mar 2019 18:56:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x289uSqc003883 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1552038989; bh=aGnH/xy3lfI4P4Pf0gopqcxOtRSY0Xj6FuRqiw7m0Ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TSqeBJUJvdm2Zj9GsK0vq15nu3owCIP1fsZo02DdyjXc3Ae0UHrcQmUQyrpTn5EE4 36/SjarjrJARMCHxC3mgpdinSPqLCa5LOlrLShKQV8n9ba6rmCO1lGMrVPWtghfGBf +zQg3IgTkRjCusyfJZnsEp369ij+P9tb0Ofy4ZMWEwG9O7Et5dMbMErgFPD+yt/XXX olJVZnXWtUTCoP3pyvm2X/wngjkxh/cwKEMk08AG2FiwWYsHoA1eN+eNJVRS91h0X5 HfQaaSXD0SX9HGNMufxMROH4BB1d5Za0PBjhVPxlWN/dUSNvkpmjNJNgynWez2p2Uw 0mFqFESxSbwmQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] kbuild: pkg: grep include/config/auto.conf instead of $KCONFIG_CONFIG Date: Fri, 8 Mar 2019 18:56:25 +0900 Message-Id: <1552038985-10473-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552038985-10473-1-git-send-email-yamada.masahiro@socionext.com> References: <1552038985-10473-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This will be a little more efficient since unset CONFIG options are stripped away from auto.conf, and we can hard-code the path to auto.conf since it is never overridden. include/config/kernel.release is generated before %pkg is run. So, it is guaranteed auto.conf is up-to-date. Signed-off-by: Masahiro Yamada --- scripts/package/builddeb | 2 +- scripts/package/buildtar | 2 +- scripts/package/mkdebian | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/scripts/package/builddeb b/scripts/package/builddeb index e2cb438..b03dd56 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -13,7 +13,7 @@ set -e is_enabled() { - grep -q "^$1=y" $KCONFIG_CONFIG + grep -q "^$1=y" include/config/auto.conf } if_enabled_echo() { diff --git a/scripts/package/buildtar b/scripts/package/buildtar index cfd2a4a..2f66c81 100755 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar @@ -56,7 +56,7 @@ dirs=boot # # Try to install modules # -if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then +if grep -q '^CONFIG_MODULES=y' include/config/auto.conf; then make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install dirs="$dirs lib" fi diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index e3726e8..dd7202f 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -7,7 +7,7 @@ set -e is_enabled() { - grep -q "^$1=y" $KCONFIG_CONFIG + grep -q "^$1=y" include/config/auto.conf } if_enabled_echo() {