| Message ID | 1537260354-30082-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 77ec0c20c7e012b5ebb22197c8a329611458cdf8 |
| Headers | show |
| Series | [1/4] kbuild: remove VERSION and PATCHLEVEL from $(objtree)/Makefile | expand |
2018年9月18日(火) 17:46 Masahiro Yamada <yamada.masahiro@socionext.com>: > > Neither VERSION nor PATCHLEVEL is used in any useful way. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Series, applies to linux-kbuild. > Makefile | 3 +-- > scripts/mkmakefile | 6 ------ > 2 files changed, 1 insertion(+), 8 deletions(-) > > diff --git a/Makefile b/Makefile > index d2976b5..6e1a059 100644 > --- a/Makefile > +++ b/Makefile > @@ -482,8 +482,7 @@ PHONY += outputmakefile > outputmakefile: > ifneq ($(KBUILD_SRC),) > $(Q)ln -fsn $(srctree) source > - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ > - $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) > + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) $(objtree) > endif > > ifeq ($(cc-name),clang) > diff --git a/scripts/mkmakefile b/scripts/mkmakefile > index e19d656..e2106444 100755 > --- a/scripts/mkmakefile > +++ b/scripts/mkmakefile > @@ -7,9 +7,6 @@ > # Usage > # $1 - Kernel src directory > # $2 - Output directory > -# $3 - version > -# $4 - patchlevel > - > > test ! -r $2/Makefile -o -O $2/Makefile || exit 0 > # Only overwrite automatically generated Makefiles > @@ -25,9 +22,6 @@ fi > cat << EOF > $2/Makefile > # Automatically generated by $0: don't edit > > -VERSION = $3 > -PATCHLEVEL = $4 > - > lastword = \$(word \$(words \$(1)),\$(1)) > makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST))) > > -- > 2.7.4 > -- Best Regards Masahiro Yamada
diff --git a/Makefile b/Makefile index d2976b5..6e1a059 100644 --- a/Makefile +++ b/Makefile @@ -482,8 +482,7 @@ PHONY += outputmakefile outputmakefile: ifneq ($(KBUILD_SRC),) $(Q)ln -fsn $(srctree) source - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ - $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) $(objtree) endif ifeq ($(cc-name),clang) diff --git a/scripts/mkmakefile b/scripts/mkmakefile index e19d656..e2106444 100755 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -7,9 +7,6 @@ # Usage # $1 - Kernel src directory # $2 - Output directory -# $3 - version -# $4 - patchlevel - test ! -r $2/Makefile -o -O $2/Makefile || exit 0 # Only overwrite automatically generated Makefiles @@ -25,9 +22,6 @@ fi cat << EOF > $2/Makefile # Automatically generated by $0: don't edit -VERSION = $3 -PATCHLEVEL = $4 - lastword = \$(word \$(words \$(1)),\$(1)) makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST)))
Neither VERSION nor PATCHLEVEL is used in any useful way. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Makefile | 3 +-- scripts/mkmakefile | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) -- 2.7.4