From patchwork Mon May 20 12:14:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 164618 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp226250ili; Mon, 20 May 2019 05:30:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzSStonOGJQRx7WiJ4/zRXbDpbZO39PUE5owDTOPeCbgsWcaBxM69ZBWjYykbFWcS+9Ydio X-Received: by 2002:a17:902:5e1:: with SMTP id f88mr28261089plf.226.1558355426223; Mon, 20 May 2019 05:30:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558355426; cv=none; d=google.com; s=arc-20160816; b=go46H/CJZNmjkEMirjE3+A0IqbgFRpQliKrBa8XS9kEJajCdTO8ZlrOSI9gOERneQl zLmwDLKNSwAYWKAZvB2ovO68apqVwfEVKyiruPl6S6Spna2tOwmz4USKvsm2a0YL0qwj ETgBEiIQ32TfKZgdQuLPxlovnKoXVaTpypFt7MS9d5TxguWQ9+jgpQogwm4rdc4Wmz2R 4HR00ghoFRM7YTTQ8W02nByO2oRIvuew1nF2Vj18OEKs9RgNcgdpurs0aipufNB2ftHL mivUfMw+Cc7mquXJuNO8vomhz+TVUFM2VXE9m1qCFCVfjCMlniptQEhFu6cdf4OBbWlK axIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0kDs8iyG6P/4vkUaF57U5KHE3mGwbNUL5gy/eSWV5/g=; b=ch41GcSk5KzVyhUFUQLh68HwjoJMs7stURcSFe1BE1jI6husH7qOOTGdiYiyy1T1OP ZTPaa00SYawZ1Ltya05GLa95zI7EOaeXXBOAFbc6FEdEHV8j+heHYat68bP+mgpaHPoF vrK4YwDU101f4IyzPfnaAZ6gG+8kr/HA1o+2KQyGKCem708Oc4e4QjcUSiAl83om46XJ Wc4E5VPUbl9RMg8ov9xtuy7JSzvpMl/2ejciORDRuz5SpXO76eytVY3k7t4mg964Yohl jafSq+RdzIEP7q7CRJ4YS7bXjaiITyk5P0vk2+//5mDiS500JQ+e3hzVm1towRMNHAoP vpNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eVZCEe5r; 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 h93si18783512plb.256.2019.05.20.05.30.25; Mon, 20 May 2019 05:30:26 -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=@kernel.org header.s=default header.b=eVZCEe5r; 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 S2390096AbfETMaZ (ORCPT + 30 others); Mon, 20 May 2019 08:30:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:46624 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390079AbfETMaV (ORCPT ); Mon, 20 May 2019 08:30:21 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 78A4120815; Mon, 20 May 2019 12:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355421; bh=0FbrDWa298P0Lw1YpNogfvug+ahYvm4drwjTmQXsT8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eVZCEe5rA6irdMakEpLObOVFbmQAdf0h1myaKd5awtQ8m12ellGx5kkfhN7p2v49i ZC4Yq/h/qGAN2XYpPVCuRibnGxcCZioqH1FgirVpXgJ6H4O3x91eVBRkLxk/G7JGHo HBI33U1dA5vDlAt+ypRFK2tuOwIf3doP2U2OyAjM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada Subject: [PATCH 5.0 113/123] kbuild: turn auto.conf.cmd into a mandatory include file Date: Mon, 20 May 2019 14:14:53 +0200 Message-Id: <20190520115252.654159903@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115245.439864225@linuxfoundation.org> References: <20190520115245.439864225@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada commit d2f8ae0e4c5c754f1b2a7b8388d19a1a977e698a upstream. syncconfig is responsible for keeping auto.conf up-to-date, so if it fails for any reason, the build must be terminated immediately. However, since commit 9390dff66a52 ("kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing"), Kbuild continues running even after syncconfig fails. You can confirm this by intentionally making syncconfig error out: # diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c # index 08ba146..307b9de 100644 # --- a/scripts/kconfig/confdata.c # +++ b/scripts/kconfig/confdata.c # @@ -1023,6 +1023,9 @@ int conf_write_autoconf(int overwrite) # FILE *out, *tristate, *out_h; # int i; # # + if (overwrite) # + return 1; # + # if (!overwrite && is_present(autoconf_name)) # return 0; Then, syncconfig fails, but Make would not stop: $ make -s mrproper allyesconfig defconfig $ make scripts/kconfig/conf --syncconfig Kconfig *** Error during sync of the configuration. make[2]: *** [scripts/kconfig/Makefile;69: syncconfig] Error 1 make[1]: *** [Makefile;557: syncconfig] Error 2 make: *** [include/config/auto.conf.cmd] Deleting file 'include/config/tristate.conf' make: Failed to remake makefile 'include/config/auto.conf'. SYSTBL arch/x86/include/generated/asm/syscalls_32.h SYSHDR arch/x86/include/generated/asm/unistd_32_ia32.h SYSHDR arch/x86/include/generated/asm/unistd_64_x32.h SYSTBL arch/x86/include/generated/asm/syscalls_64.h [ continue running ... ] The reason is in the behavior of a pattern rule with multi-targets. %/auto.conf %/auto.conf.cmd %/tristate.conf: $(KCONFIG_CONFIG) $(Q)$(MAKE) -f $(srctree)/Makefile syncconfig GNU Make knows this rule is responsible for making all the three files simultaneously. As far as examined, auto.conf.cmd is the target in question when this rule is invoked. It is probably because auto.conf.cmd is included below the inclusion of auto.conf. The inclusion of auto.conf is mandatory, while that of auto.conf.cmd is optional. GNU Make does not care about the failure in the process of updating optional include files. I filed this issue (https://savannah.gnu.org/bugs/?56301) in case this behavior could be improved somehow in future releases of GNU Make. Anyway, it is quite easy to fix our Makefile. Given that auto.conf is already a mandatory include file, there is no reason to stick auto.conf.cmd optional. Make it mandatory as well. Cc: linux-stable # 5.0+ Fixes: 9390dff66a52 ("kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing") Signed-off-by: Masahiro Yamada [commented out diff above to keep patch happy - gregkh] Signed-off-by: Greg Kroah-Hartman --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/Makefile +++ b/Makefile @@ -642,7 +642,7 @@ ifeq ($(may-sync-config),1) # Read in dependencies to all Kconfig* files, make sure to run syncconfig if # changes are detected. This should be included after arch/$(SRCARCH)/Makefile # because some architectures define CROSS_COMPILE there. --include include/config/auto.conf.cmd +include include/config/auto.conf.cmd # To avoid any implicit rule to kick in, define an empty command $(KCONFIG_CONFIG): ;