Received-SPF: pass (google.com: domain of linux-kernel+bounces-89173-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Fri, 1 Mar 2024 15:16:11 -0700
From: Nathan Chancellor <nathan@kernel.org>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicolas Schier <nicolas@fjasle.eu>
Subject: Re: [PATCH] kbuild: fix inconsistent indentation in top Makefile
Message-ID: <20240301221611.GB2610495@thelio-3990X>
References: <20240301112108.1958281-1-masahiroy@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240301112108.1958281-1-masahiroy@kernel.org>

On Fri, Mar 01, 2024 at 08:21:07PM +0900, Masahiro Yamada wrote:
> 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 <masahiroy@kernel.org>

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
> 
>  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
> -- 
> 2.40.1
>