From patchwork Fri Mar 1 11:21:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 208792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp1008493dyb; Fri, 1 Mar 2024 03:23:04 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW0rImz5SPNM0CyngbRO5aHq6jnNGQUn2u9dJ1kO5CXSwmxMV6NZwG/+5YeYN7MiEpFdXEUZNejoP8q58IXz9cWOTLxlg== X-Google-Smtp-Source: AGHT+IHIZRiNdyBudtXTGFRsNdAVCKsIzsqT50HERnYEGv/01tgK5W/wom75cvJ6+tLXE2abuJan X-Received: by 2002:a05:6808:1706:b0:3c1:cb6a:127 with SMTP id bc6-20020a056808170600b003c1cb6a0127mr1644563oib.3.1709292184072; Fri, 01 Mar 2024 03:23:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709292184; cv=pass; d=google.com; s=arc-20160816; b=GH5aFxc2Qx6GNj1cxKYmGuHFXFm11dacgMjE/Kznpzpa0ynPd7APFedlhicmrD8625 xAf4uk6XeR+1q2wzQr2olQYszZPWnP6/cfDLHWQnm24Bp20FnWA/pcWzcb2RQyZB3RiK Cn4pfHXtTfNqYpmf5ufeugIa0LVHO+seiOfDVxH4zXHI6VsDATw93gDIiX4VWJmfRS7Y 20Pq1UCFMO8FfBWpO9yaQnGwShE+NHtIBZMyO8SUYBu+1MwGeBHWh9DSwIa/+9+AsrUi 2i0PGtLRTlP3cHBzNg9kODt7f5xfJIsz30yerXiLGthCTMHsgieZUDsW/3CWx+v6Mldv YHRA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=/0VsA/ncCsYK5NQkGQENzEUVmYnE8S3HSIKNK8TXDss=; fh=Holx/gsvO+HQsywX+F3JNZNWvkftjXvD+Yg8VWBHNAk=; b=kDSAVsl/z0t7cf9W5PAfUzCwHflyDDjhTKpWbfZrIRCFUEkacpHhmLJUpKYmP5NMtT dBJ1o1pyN6xDaFPFnGNcNob05Y+5EDD+Uo+A0RfKWi1TT80DmTcnVfQZYzULpAJ0rMst 3GfXo+YOR38RXImTqwkqGpNbh4E/qajb0IYdgsqWKXv1qz4Zx2v22k0UICDBJ6VHlByh LLoGrVW+j4C8E/YyvYTifispeVWW0flP03JTqN2xwugaWuoknnVYVPRcgXvjqPhq/E4D Y2hhGezU47WvZnVUPFNBkC1mvu5aYXnb6z81PdMoItR9/+ojl3oNyiV0sU7Sf0c3G3QN WFsQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G8Ukx78L; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-88329-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88329-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id s132-20020a632c8a000000b005dc3d92a492si3231194pgs.39.2024.03.01.03.23.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 03:23:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88329-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G8Ukx78L; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-88329-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88329-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id DAE5A28109F for ; Fri, 1 Mar 2024 11:23:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C24406F07D; Fri, 1 Mar 2024 11:21:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G8Ukx78L" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1771F6EB67; Fri, 1 Mar 2024 11:21:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709292076; cv=none; b=X0XXC8w4ybkESQkKt9hBdlFnkLIsTlBJixReyBmC+0JpU8ENIA8ZLiNgLBteaCmqT9zmromafkzrqB7inYO24aLmzVZq5xfi7ID8ShalB8vYC/LMfLzqgqs8dYYKJ3T6sl0P/DQbmjxItvBUbv3edaJuZi4l4y5R9ZuytCcLILQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709292076; c=relaxed/simple; bh=cNhMBWpiIXbrwsjTit2mkJw/SkP6QTkIJSldHKK4TP4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=vGSXAgE83JUiAY6bzonVXlovpkj2jFgizbaJ5MktA9aFkvMv11OxoFwboNDy5X9WKvTP6kYzb8SqdL91OVzFMqUpthwJHq+GyIQSDc9vlbInqO429kcAozv4TwRSFN/7RoMjT4Yyie+3matfANVJcmzD1/YmGm24y5R6C7zaITE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G8Ukx78L; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D4DBC433C7; Fri, 1 Mar 2024 11:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709292075; bh=cNhMBWpiIXbrwsjTit2mkJw/SkP6QTkIJSldHKK4TP4=; h=From:To:Cc:Subject:Date:From; b=G8Ukx78LZgsgW+Gf0DDSwLB68wM5t71dsRFJdevvx4T5ixJO2JBlgk6qhMqZEse66 7RA3zbmhD/THIh/BYhRXJYkUh9dUn2HlhN2NZcG/wzeIXotCvSdEETvBdGDMsu2+Dw wYzTTh8SPx8EMXI0BbmQN+2JHCcF2Po9KXksp9V0dAXEq2nk/Ko1YVlUJYHRzfiXGj bBr5cd+dYsyzWJQVLFq4SiBLZmVakM0LkYSJN3VUgOuUQxB+qYXvrD8nEuR8H8BmsQ //fzxgq2LwzMRdGVI2tzhOyljoar3O/qoWh2aJ7FClO31GwmizF0R8ViTwybIs3vfS m3ahvTa+q3tWA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nicolas Schier Subject: [PATCH] kbuild: fix inconsistent indentation in top Makefile Date: Fri, 1 Mar 2024 20:21:07 +0900 Message-Id: <20240301112108.1958281-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792322760986767341 X-GMAIL-MSGID: 1792322760986767341 Commit 3b9ab248bc45 ("kbuild: use 4-space indentation when followed by conditionals") introduced inconsistent indentation because it deliberately touched only the conditional directives to minimize the change set. This commit reformats some blocks in the top Makefile so they are consistently indented with 4 spaces. Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor --- Makefile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index d84c0fb215fd..859b0f52949e 100644 --- a/Makefile +++ b/Makefile @@ -295,51 +295,51 @@ single-build := ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),) - need-config := + need-config := endif endif ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),) ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),) - may-sync-config := + may-sync-config := endif endif need-compiler := $(may-sync-config) ifneq ($(KBUILD_EXTMOD),) - may-sync-config := + may-sync-config := endif ifeq ($(KBUILD_EXTMOD),) - ifneq ($(filter %config,$(MAKECMDGOALS)),) - config-build := 1 - ifneq ($(words $(MAKECMDGOALS)),1) - mixed-build := 1 - endif + ifneq ($(filter %config,$(MAKECMDGOALS)),) + config-build := 1 + ifneq ($(words $(MAKECMDGOALS)),1) + mixed-build := 1 endif + endif endif # We cannot build single targets and the others at the same time ifneq ($(filter $(single-targets), $(MAKECMDGOALS)),) - single-build := 1 + single-build := 1 ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),) - mixed-build := 1 + mixed-build := 1 endif endif # For "make -j clean all", "make -j mrproper defconfig all", etc. ifneq ($(filter $(clean-targets),$(MAKECMDGOALS)),) - ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),) - mixed-build := 1 - endif + ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),) + mixed-build := 1 + endif endif # install and modules_install need also be processed one by one ifneq ($(filter install,$(MAKECMDGOALS)),) - ifneq ($(filter modules_install,$(MAKECMDGOALS)),) - mixed-build := 1 - endif + ifneq ($(filter modules_install,$(MAKECMDGOALS)),) + mixed-build := 1 + endif endif ifdef mixed-build