From patchwork Mon Mar 4 16:57:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseny Maslennikov X-Patchwork-Id: 10838069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 491CB1515 for ; Mon, 4 Mar 2019 16:58:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3675A2AC01 for ; Mon, 4 Mar 2019 16:58:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A4602AC0C; Mon, 4 Mar 2019 16:58:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDAEF2AC01 for ; Mon, 4 Mar 2019 16:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727183AbfCDQ6B (ORCPT ); Mon, 4 Mar 2019 11:58:01 -0500 Received: from imap.cs.msu.ru ([188.44.42.39]:51197 "EHLO mail.cs.msu.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727041AbfCDQ6A (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=GW7/I+1ooMEHxbcRBe6rOsQfqs8GoPoLWmKDIsnnTrg=; b=nvhFwnDjGU10k+UibDzIqftVM3 kA+ZXAed9jDKK8PwVg3agj8hJHRZlbK5QfycHXeLIhAlgu9fRN+lC0OLCvmkG3WXOsvXzaSabynRu QZidLM0EMKQKU6MsjyDxht0gwEte6Fcz/JhqlNJEMbFsUcbc9TGTLJDiSbs6y6nURZpEvlNJaqcRw XiSK9QCZX3xBTXFMSGsawHIppxINSBvsCtVbMqJOzFWSkeOjgDc62Zk9xsShWOSboj1zJNgH0+JmC lsq+fTOKbe20Pg6928/cO5i8bV8qHT9L8VBBudXlks0tn0iDrDbKNM5cKzt68lCchYNgU4nTKYDti eENFr2ww==; 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-KN; 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:31 +0300 Message-Id: <20190304165732.24043-3-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 X-SA-Exim-Connect-IP: 10.7.4.141 X-SA-Exim-Mail-From: ar@cs.msu.ru Subject: [PATCH 2/3] Makefile: kselftest: use KCONFIG_CONFIG X-SA-Exim-Version: 4.2 X-SA-Exim-Scanned: Yes (on mail.cs.msu.ru) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d5713e7b1e50..4d8760166a47 100644 --- a/Makefile +++ b/Makefile @@ -1199,9 +1199,9 @@ kselftest-clean: PHONY += kselftest-merge kselftest-merge: - $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) + $(if $(wildcard $(objtree)/$(KCONFIG_CONFIG)),, $(error No $(KCONFIG_CONFIG) exists, config your kernel first!)) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ - -m $(objtree)/.config \ + -m $(objtree)/$(KCONFIG_CONFIG) \ $(srctree)/tools/testing/selftests/*/config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig