diff mbox

[v4] kbuild: trivial cleanups on the comments

Message ID 1501587394-32226-1-git-send-email-caoj.fnst@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cao jin Aug. 1, 2017, 11:36 a.m. UTC
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
Since this one has not been merged yet and I find more cleanups,
so I have v4 out.

v3 addressed comments from Masahiro-san and Randy Dunlap.
v4 find several more cleanups in Makefile.build worth to be
   included into this trivial patch.

 Makefile               | 6 +++---
 scripts/Kbuild.include | 7 +++----
 scripts/Makefile.build | 8 ++++----
 scripts/basic/Makefile | 2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

Comments

Masahiro Yamada Aug. 2, 2017, 12:31 a.m. UTC | #1
Hi.

2017-08-01 20:36 GMT+09:00 Cao jin <caoj.fnst@cn.fujitsu.com>:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
> Since this one has not been merged yet and I find more cleanups,
> so I have v4 out.
>
> v3 addressed comments from Masahiro-san and Randy Dunlap.
> v4 find several more cleanups in Makefile.build worth to be
>    included into this trivial patch.


OK, this is a collection of trivial fixes.


While you are here, could you fix the following as well?


[1]
Makefile line 445:
# Basic helpers built in scripts/

    scripts/   ->   scripts/basic/


[2]
Makefile line 508:
# install and module_install need also be processed one by one


   module_install  ->  modules_install
Cao jin Aug. 2, 2017, 2:21 a.m. UTC | #2
On 08/02/2017 08:31 AM, Masahiro Yamada wrote:
> Hi.
> 
> 2017-08-01 20:36 GMT+09:00 Cao jin <caoj.fnst@cn.fujitsu.com>:
>> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
>> ---
>> Since this one has not been merged yet and I find more cleanups,
>> so I have v4 out.
>>
>> v3 addressed comments from Masahiro-san and Randy Dunlap.
>> v4 find several more cleanups in Makefile.build worth to be
>>    included into this trivial patch.
> 
> 
> OK, this is a collection of trivial fixes.
> 
> 
> While you are here, could you fix the following as well?
> 
> 
> [1]
> Makefile line 445:
> # Basic helpers built in scripts/
> 
>     scripts/   ->   scripts/basic/
> 
> 
> [2]
> Makefile line 508:
> # install and module_install need also be processed one by one
> 
> 
>    module_install  ->  modules_install
> 
> 

Sure, Masahiro-san, thanks for your reminding.
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 7b60fb3..2600f03 100644
--- a/Makefile
+++ b/Makefile
@@ -961,7 +961,7 @@  export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
 export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y)
 export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds
 export LDFLAGS_vmlinux
-# used by scripts/pacmage/Makefile
+# used by scripts/package/Makefile
 export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)
 
 vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)
@@ -989,8 +989,8 @@  include/generated/autoksyms.h: FORCE
 ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
 
 # Final link of vmlinux with optional arch pass after final link
-    cmd_link-vmlinux =                                                 \
-	$(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) ;       \
+cmd_link-vmlinux =                                                 \
+	$(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) ;    \
 	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
 
 vmlinux: scripts/link-vmlinux.sh vmlinux_prereq $(vmlinux-deps) FORCE
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 61f87a9..2e721fc 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -85,8 +85,8 @@  TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
 
 # try-run
 # Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise)
-# Exit code chooses option. "$$TMP" is can be used as temporary file and
-# is automatically cleaned up.
+# Exit code chooses option. "$$TMP" serves as a temporary file and is
+# automatically cleaned up.
 try-run = $(shell set -e;		\
 	TMP="$(TMPOUT).$$$$.tmp";	\
 	TMPO="$(TMPOUT).$$$$.o";	\
@@ -256,7 +256,6 @@  make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
 any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)
 
 # Execute command if command has changed or prerequisite(s) are updated.
-#
 if_changed = $(if $(strip $(any-prereq) $(arg-check)),                       \
 	@set -e;                                                             \
 	$(echo-cmd) $(cmd_$(1));                                             \
@@ -310,7 +309,7 @@  if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ),                 \
 	$(rule_$(1)), @:)
 
 ###
-# why - tell why a a target got build
+# why - tell why a target got built
 #       enabled by make V=2
 #       Output (listed in the order they are checked):
 #          (1) - due to target is PHONY
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 733e044..ee95762 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -229,8 +229,8 @@  ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
 endif
 # Due to recursion, we must skip empty.o.
 # The empty.o file is created in the make process in order to determine
-#  the target endianness and word size. It is made before all other C
-#  files, including recordmcount.
+# the target endianness and word size. It is made before all other C
+# files, including recordmcount.
 sub_cmd_record_mcount =					\
 	if [ $(@) != "scripts/mod/empty.o" ]; then	\
 		$(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)";	\
@@ -245,13 +245,13 @@  sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH
 	"$(LD)" "$(NM)" "$(RM)" "$(MV)" \
 	"$(if $(part-of-module),1,0)" "$(@)";
 recordmcount_source := $(srctree)/scripts/recordmcount.pl
-endif
+endif # BUILD_C_RECORDMCOUNT
 cmd_record_mcount =						\
 	if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" =	\
 	     "$(CC_FLAGS_FTRACE)" ]; then			\
 		$(sub_cmd_record_mcount)			\
 	fi;
-endif
+endif # CONFIG_FTRACE_MCOUNT_RECORD
 
 ifdef CONFIG_STACK_VALIDATION
 ifneq ($(SKIP_STACK_VALIDATION),1)
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index ec10d93..0372b33 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -1,5 +1,5 @@ 
 ###
-# Makefile.basic lists the most basic programs used during the build process.
+# This Makefile lists the most basic programs used during the build process.
 # The programs listed herein are what are needed to do the basic stuff,
 # such as fix file dependencies.
 # This initial step is needed to avoid files to be recompiled