From patchwork Thu Jul 5 02:39:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 141096 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1409667ljj; Wed, 4 Jul 2018 19:42:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdj7GvuXxF8MK+femDaZyHEL94+MwEIm3Kvh7G4yRcAnQcujojpx76rcigsWWFZIIL6UOJw X-Received: by 2002:a62:3d86:: with SMTP id x6-v6mr4431836pfj.192.1530758538615; Wed, 04 Jul 2018 19:42:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530758538; cv=none; d=google.com; s=arc-20160816; b=D7mfOXZINkFH0T2nD5phK9haWzcx9wjc1boyknWf7Z77o3uQztMn78o0b3RMdUeoxb SRtAwI+ODs+jry/wr8zPm9u9FDDhAgRiHlFjOBRwzQd1G8Mowo8ylWKs0l814QN80EUI lmo3i0DO6Xpf/qMF2EdIckx5SlwiQac5JpX++oppWrgjAHaze6lXHIbFwJ+uqqM16CwJ pxARukdsjTkUAfcz/mcpgwppW4fKe/ETg3EKZKJDKqLVmc9QRt1pjplOMbrle9Hlzw7c GzwP3teoJ4XCsVK0mnCyWxjmFLPoZSso3E+Mpu23oXiY2lHHZJUijcScoNjorhf3X3hg NkZA== 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 :arc-authentication-results; bh=ff2I2ZXiCD//Ov0MDFFTpaElbwzFiTPXI1cCDc6X+Vk=; b=jaRHIuwib3tXU04WSgzlMdwA5vQ+GdT7YfQp+PG8JCnVVZSLzCgaCTgVbJ/yeXa4I6 U24hLuThY5675HUlMqrK9fW2ppNpHKiQozDAlWBiPAOyZf9SiRVPJ2nx2oApjAru89dz wMmfc9Ol+CGs69C9N+DpLm8BF4Jgq+RYz9mZQe+j3ERss4oDxpUxvQcz4iQvGWTE8eO6 QXFErvCyJJNUXWlsgk5swVzwnuRIIp7cOFRLUOkj3aDpKVbpigutGV9I8AZ1vEf0rp9P E0sGbi+ATMiLWL6UrmeKmzMukX3wLa8nU50C9YjEr+2xS4F8EkVqhfacuHawkCctZTtB qfCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rD6yPOro; 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 67-v6si4981791pfe.49.2018.07.04.19.42.18; Wed, 04 Jul 2018 19:42:18 -0700 (PDT) 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=rD6yPOro; 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 S1753471AbeGEClx (ORCPT + 31 others); Wed, 4 Jul 2018 22:41:53 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:44282 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753430AbeGEClt (ORCPT ); Wed, 4 Jul 2018 22:41:49 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id w652duZh028145; Thu, 5 Jul 2018 11:40:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w652duZh028145 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1530758405; bh=ff2I2ZXiCD//Ov0MDFFTpaElbwzFiTPXI1cCDc6X+Vk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rD6yPOrokJFMl6tCmwQzlSYzzrbcN4XgTmcO7vLDqFnrsxIhfU4a0jjfPEfYk+VGa IQcJao70r76VRLQH+zvCg74Vpe1wsJ6Era6blWG7w8DP+Ashqmk302QN9PNa8fyEbR EQuJVSeAEfgYrAkCIwdNnqwZXgrBU0s6fc6C0mG/GLD+LXDNmQDtIaxlYS1lyHSmS8 tLT6Xb0GUTELQ0AiI6TyBt/AiVD1xIW5UmcQWGxCFXhtTAWe9XMJFCoUA4haTnVB7e JFUHcTTa0rsE5kiqldt5w5iBr1wN8SnZunHYlvXP3xejsTaVHV8Xuf/d8k59o1s09d OQq0qEeBq/1VA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Dirk Gouders , Ulf Magnusson , Linus Torvalds , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v3 11/12] kbuild: remove auto.conf and tristate.conf from prerequisites Date: Thu, 5 Jul 2018 11:39:48 +0900 Message-Id: <1530758389-30862-12-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530758389-30862-1-git-send-email-yamada.masahiro@socionext.com> References: <1530758389-30862-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 The top-level Makefile adds include/config/auto.conf as prerequisites of 'scripts', 'prepare1', etc. They were needed to terminate the build when include/config/auto.conf is missing. Now that the inclusion of include/config/auto.conf is mandatory in the top-level Makefile if dot-config is 1 (Note 'include' directive is used instead of '-include'). Make terminates the build by itself if it fails to create or update include/config/auto.conf so we are sure that include/config/auto.conf exists in the very first stage of make. We do not have to explicitly list include/config/auto.conf as prerequisites any more. include/config/tristate.conf is generated as a side-effect of syncconfig; if auto.conf exists, tristate.conf exists as well (unless a user does 'rm include/config/tristate.conf') Signed-off-by: Masahiro Yamada --- Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index c258937..c6ab38c4 100644 --- a/Makefile +++ b/Makefile @@ -649,10 +649,6 @@ include/config/auto.conf: /bin/false) endif # may-sync-config - -else -# Dummy target needed, because used as prerequisite -include/config/auto.conf: ; endif # $(dot-config) KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) @@ -1047,15 +1043,14 @@ define filechk_kernel.release endef # Store (new) KERNELRELEASE string in include/config/kernel.release -include/config/kernel.release: include/config/auto.conf FORCE +include/config/kernel.release: $(srctree)/Makefile FORCE $(call filechk,kernel.release) # Additional helpers built in scripts/ # Carefully list dependencies so we do not try to build scripts twice # in parallel PHONY += scripts -scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \ - asm-generic gcc-plugins $(autoksyms_h) +scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h) $(Q)$(MAKE) $(build)=$(@) # Things we need to do before we recursively start building the kernel @@ -1085,8 +1080,7 @@ endif # that need to depend on updated CONFIG_* values can be checked here. prepare2: prepare3 outputmakefile asm-generic -prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h \ - include/config/auto.conf +prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h $(cmd_crmodverdir) archprepare: archheaders archscripts prepare1 scripts_basic @@ -1224,7 +1218,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) $(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin -%/modules.builtin: include/config/auto.conf +%/modules.builtin: $(Q)$(MAKE) $(modbuiltin)=$*