Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp2606445imb; Mon, 4 Mar 2019 09:15:51 -0800 (PST) X-Google-Smtp-Source: APXvYqxRIkFR+VO2DbqdEI5diDLlwsO8tFdxC/dmn51o8bTL3r9Dkb/aVFNDL2UKBCQ/xkNs6/oI X-Received: by 2002:aa7:8743:: with SMTP id g3mr20593365pfo.109.1551719751242; Mon, 04 Mar 2019 09:15:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551719751; cv=none; d=google.com; s=arc-20160816; b=UzIbFuPjufQn8snJbI7jIfztk4xsO93IVZ+Z+Stu+O6uuMidg7023z7yxFHfvfQOq5 kJw37pAQSc4byHcZQJZrxvoF3yxwj1XPV9lLQQ/tQnr2te6yHh1D21fTpmoEmdCk0/BR 5wx+G0hlxneaeU6HPtnRAtw+3vuQmAorIViDom4paq5ZfL732tMNJTM5IAulJ5joRIb2 ik3uSNlFRHkdKZTfxPJA/YKyHW5RiW3RnaO9WzdjZ70ZL3teZJsnSR/k2fME7yYXy/ul t7sLj08BxsSdCmuRJVndNzLtPLkxmjFk28jQ4Ul9xAa80i0sFLkvlEVKRLjaf6nvrbmv +x3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:cc:to:from :dkim-signature; bh=1hHDnrBWRgx1wOpaCGBwWc59L/HnawNq9sjy5Dr/Yyc=; b=mbB3U2310c76riGVpXauFW9THNj/XdnaoDHOL/UWG5/oT0mFm3k9gJt//8nGnMwwhX nfutsrDXADnaJUR9n/e0Jod1UZSTLB8dJKKwZ+160ZwMJ13sDa1xFdnqNgv5Uf+oBMWv Z8RKGhzyxcT1snMlNg8Z8nSTXKd7n/JT9ywJc8CwYF2Bp6fZv+PNiRImuLhhwlxmgH5I qkxdxSDr3k98UwlGTRvhZXfTbv1wnmbJVfgLbh3IeGNTK3IXuEtmC8xJcFkv09ICvMQK s6BlnPq/TxKd8/yeh42xN8Pjp03sY41KJTsr32LoSfip2oQTawgD1qzf7v/UcZYtkH9J 2Q6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@cs.msu.ru header.s=dkim header.b="lbA/PVFk"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=cs.msu.ru Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a8si5521487pff.277.2019.03.04.09.15.35; Mon, 04 Mar 2019 09:15:51 -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=fail header.i=@cs.msu.ru header.s=dkim header.b="lbA/PVFk"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=cs.msu.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727139AbfCDQ6B (ORCPT + 99 others); Mon, 4 Mar 2019 11:58:01 -0500 Received: from imap.cs.msu.ru ([188.44.42.39]:62109 "EHLO mail.cs.msu.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726063AbfCDQ6A (ORCPT ); Mon, 4 Mar 2019 11:58:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=cs.msu.ru; s=dkim; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1hHDnrBWRgx1wOpaCGBwWc59L/HnawNq9sjy5Dr/Yyc=; b=lbA/PVFklmDFpvhjv74M8CgiNv wybbfOSou8NjJR6iU+4nPmuWwc//5pUq020r82OxVXGeBwAAWA2ZTMqbmCC+rxU7PxW7LpWe88tts 6/rswrsPg9PEWS1tHfMoOvGgzrWPFmaMPXNLAelAkf5qnWcQrh1JXYlyFytdwF9fau8FOXdODu3Qj plwJn+MP1Qu5+GbUw9GNKFT9K47gPxzPq/SfZ2+iD6lulyJPQJuy7Wr/IYFcefopiI+fSE14w5YNs GPeDJK9VJMv98oasCZm2cXd+VLS9rnZ3GU/LDq12vmtWbEDmgyh0PqNBFNHbVDHP1Xvt7ikklsL9o 5gwLBE1w==; Received: from [10.7.4.141] (port=59860 helo=cello.cs.msu.ru) by mail.cs.msu.ru with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91 (FreeBSD)) (envelope-from ) id 1h0quO-000JP0-Bi; Mon, 04 Mar 2019 19:57:44 +0300 From: Arseny Maslennikov To: Masahiro Yamada , Michal Marek , Jeff Dike , Richard Weinberger , Anton Ivanov Cc: Arseny Maslennikov , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-um@lists.infradead.org Date: Mon, 4 Mar 2019 19:57:30 +0300 Message-Id: <20190304165732.24043-2-ar@cs.msu.ru> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190304165732.24043-1-ar@cs.msu.ru> References: <20190304165732.24043-1-ar@cs.msu.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 10.7.4.141 X-SA-Exim-Mail-From: ar@cs.msu.ru X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.cs.msu.ru X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_ALL,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Subject: [PATCH 1/3] kconfig/Makefile: localmodconfig: use KCONFIG_CONFIG X-SA-Exim-Version: 4.2 X-SA-Exim-Scanned: Yes (on mail.cs.msu.ru) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the config file is reassigned through the KCONFIG_CONFIG makeflag/envvar, this rule still attempts to use the wrong, possibly nonexistent file. Let's fix that. Signed-off-by: Arseny Maslennikov --- scripts/kconfig/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 1c7ac07def4d..28be91964a20 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -44,14 +44,14 @@ build_xconfig: $(obj)/qconf localyesconfig localmodconfig: $(obj)/conf $(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config - $(Q)if [ -f .config ]; then \ - cmp -s .tmp.config .config || \ - (mv -f .config .config.old.1; \ - mv -f .tmp.config .config; \ + $(Q)if [ -f $(KCONFIG_CONFIG) ]; then \ + cmp -s .tmp.config $(KCONFIG_CONFIG) || \ + (mv -f $(KCONFIG_CONFIG) .tmp.config.old.1; \ + mv -f .tmp.config $(KCONFIG_CONFIG); \ $< $(silent) --oldconfig $(Kconfig); \ - mv -f .config.old.1 .config.old) \ + mv -f .tmp.config.old.1 $(KCONFIG_CONFIG).old) \ else \ - mv -f .tmp.config .config; \ + mv -f .tmp.config $(KCONFIG_CONFIG); \ $< $(silent) --oldconfig $(Kconfig); \ fi $(Q)rm -f .tmp.config -- 2.20.1