Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild updates from Michal Marek: "Here are the kbuild changes for v3.19-rc1: - Cleanups and deduplication in the main Makefile and scripts/Makefile.* - Sort the output of *config targets in make help - Old <linux/version.h> is always removed to avoid a surprise during bisecting - Warning fix in kconfig" * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: remove redundant -rR flag of hdr-inst kbuild: Fix make help-<board series> on powerpc kbuild: Automatically remove stale <linux/version.h> file kconfig: Fix warning "‘jump’ may be used uninitialized" Makefile: sort list of defconfig targets in make help output kbuild: Remove duplicate $(cmd) definition in Makefile.clean kbuild: collect shorthands into scripts/Kbuild.include

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek: "Here are the kbuild changes for v3.19-rc1: - Cleanups and deduplication in the main Makefile and scripts/Makefile.* - Sort the output of *config targets in make help - Old <linux/version.h> is always removed to avoid a surprise during bisecting - Warning fix in kconfig" * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: remove redundant -rR flag of hdr-inst kbuild: Fix make help-<board series> on powerpc kbuild: Automatically remove stale <linux/version.h> file kconfig: Fix warning "‘jump’ may be used uninitialized" Makefile: sort list of defconfig targets in make help output kbuild: Remove duplicate $(cmd) definition in Makefile.clean kbuild: collect shorthands into scripts/Kbuild.include
Linus Torvalds
2 parents ecb5ec044a 1846dfbde3
Showing 5 changed files Side-by-side Diff
Makefile
scripts/Kbuild.include
scripts/Makefile.clean
scripts/Makefile.headersinst
scripts/kconfig/menu.c
@@ -481,9 +481,10 @@
 # of make so .config is not included in this case either (for *config).
  
 version_h := include/generated/uapi/linux/version.h
+old_version_h := include/linux/version.h
  
 no-dot-config-targets := clean mrproper distclean \
-			 cscope gtags TAGS tags help %docs check% coccicheck \
+			 cscope gtags TAGS tags help% %docs check% coccicheck \
 			 $(version_h) headers_% archheaders archscripts \
 			 kernelversion %src-pkg
  
@@ -1005,6 +1006,7 @@
  
 $(version_h): $(srctree)/Makefile FORCE
 	$(call filechk,version.h)
+	$(Q)rm -f $(old_version_h)
  
 include/generated/utsrelease.h: include/config/kernel.release FORCE
 	$(call filechk,utsrelease.h)
@@ -1036,8 +1038,6 @@
 #Default location for installed headers
 export INSTALL_HDR_PATH = $(objtree)/usr
  
-hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
-
 # If we do an all arch process set dst to asm-$(hdr-arch)
 hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
  
@@ -1175,7 +1175,7 @@
 		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
 		  signing_key.priv signing_key.x509 x509.genkey		\
 		  extra_certificates signing_key.x509.keyid		\
-		  signing_key.x509.signer include/linux/version.h
+		  signing_key.x509.signer
  
 # clean - Delete most, but leave enough to build external modules
 #
@@ -1235,7 +1235,7 @@
 # ---------------------------------------------------------------------------
  
 boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
-boards := $(notdir $(boards))
+boards := $(sort $(notdir $(boards)))
 board-dirs := $(dir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*/*_defconfig))
 board-dirs := $(sort $(notdir $(board-dirs:/=)))
  
@@ -1326,7 +1326,7 @@
  
 help-boards: $(help-board-dirs)
  
-boards-per-dir = $(notdir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/$*/*_defconfig))
+boards-per-dir = $(sort $(notdir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/$*/*_defconfig)))
  
 $(help-board-dirs): help-%:
 	@echo  'Architecture specific targets ($(SRCARCH) $*):'
@@ -1580,11 +1580,6 @@
   $(cmd_files): ;	# Do not try to update included dependency files
   include $(cmd_files)
 endif
-
-# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir
-# Usage:
-# $(Q)$(MAKE) $(clean)=dir
-clean := -f $(srctree)/scripts/Makefile.clean obj
  
 endif	# skip-makefile
  
@@ -185,6 +185,18 @@
 # $(Q)$(MAKE) $(dtbinst)=dir
 dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj
  
+###
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=
+# Usage:
+# $(Q)$(MAKE) $(clean)=dir
+clean := -f $(srctree)/scripts/Makefile.clean obj
+
+###
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.headersinst obj=
+# Usage:
+# $(Q)$(MAKE) $(hdr-inst)=dir
+hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
+
 # Prefix -I with $(srctree) if it is not an absolute path.
 # skip if -I has no parameter
 addtree = $(if $(patsubst -I%,%,$(1)), \
@@ -7,10 +7,7 @@
 PHONY := __clean
 __clean:
  
-# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir
-# Usage:
-# $(Q)$(MAKE) $(clean)=dir
-clean := -f $(srctree)/scripts/Makefile.clean obj
+include scripts/Kbuild.include
  
 # The filename Kbuild has precedence over Makefile
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
@@ -90,11 +87,6 @@
 PHONY += $(subdir-ymn)
 $(subdir-ymn):
 	$(Q)$(MAKE) $(clean)=$@
-
-# If quiet is set, only print short version of command
-
-cmd = @$(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))' &&) $(cmd_$(1))
-
  
 # Declare the contents of the .PHONY variable as phony.  We keep that
 # information in a variable se we can use it in if_changed and friends.
@@ -122,7 +122,6 @@
 endif
  
 # Recursion
-hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
 .PHONY: $(subdirs)
 $(subdirs):
 	$(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@
@@ -548,7 +548,7 @@
 {
 	int i, j;
 	struct menu *submenu[8], *menu, *location = NULL;
-	struct jump_key *jump;
+	struct jump_key *jump = NULL;
  
 	str_printf(r, _("Prompt: %s\n"), _(prop->text));
 	menu = prop->menu->parent;
@@ -586,7 +586,7 @@
 		str_printf(r, _("  Location:\n"));
 		for (j = 4; --i >= 0; j += 2) {
 			menu = submenu[i];
-			if (head && location && menu == location)
+			if (jump && menu == location)
 				jump->offset = strlen(r->s);
 			str_printf(r, "%*c-> %s", j, ' ',
 				   _(menu_get_prompt(menu)));
...	...	@@ -481,9 +481,10 @@
481	481	# of make so .config is not included in this case either (for *config).
482	482
483	483	version_h := include/generated/uapi/linux/version.h
	484	+old_version_h := include/linux/version.h
484	485
485	486	no-dot-config-targets := clean mrproper distclean \
486		- cscope gtags TAGS tags help %docs check% coccicheck \
	487	+ cscope gtags TAGS tags help% %docs check% coccicheck \
487	488	$(version_h) headers_% archheaders archscripts \
488	489	kernelversion %src-pkg
489	490
...	...	@@ -1005,6 +1006,7 @@
1005	1006
1006	1007	$(version_h): $(srctree)/Makefile FORCE
1007	1008	$(call filechk,version.h)
	1009	+ $(Q)rm -f $(old_version_h)
1008	1010
1009	1011	include/generated/utsrelease.h: include/config/kernel.release FORCE
1010	1012	$(call filechk,utsrelease.h)
...	...	@@ -1036,8 +1038,6 @@
1036	1038	#Default location for installed headers
1037	1039	export INSTALL_HDR_PATH = $(objtree)/usr
1038	1040
1039		-hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
1040		-
1041	1041	# If we do an all arch process set dst to asm-$(hdr-arch)
1042	1042	hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
1043	1043
...	...	@@ -1175,7 +1175,7 @@
1175	1175	Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
1176	1176	signing_key.priv signing_key.x509 x509.genkey \
1177	1177	extra_certificates signing_key.x509.keyid \
1178		- signing_key.x509.signer include/linux/version.h
	1178	+ signing_key.x509.signer
1179	1179
1180	1180	# clean - Delete most, but leave enough to build external modules
1181	1181	#
...	...	@@ -1235,7 +1235,7 @@
1235	1235	# ---------------------------------------------------------------------------
1236	1236
1237	1237	boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
1238		-boards := $(notdir $(boards))
	1238	+boards := $(sort $(notdir $(boards)))
1239	1239	board-dirs := $(dir $(wildcard $(srctree)/arch/$(SRCARCH)/configs//_defconfig))
1240	1240	board-dirs := $(sort $(notdir $(board-dirs:/=)))
1241	1241
...	...	@@ -1326,7 +1326,7 @@
1326	1326
1327	1327	help-boards: $(help-board-dirs)
1328	1328
1329		-boards-per-dir = $(notdir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/$/_defconfig))
	1329	+boards-per-dir = $(sort $(notdir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/$/_defconfig)))
1330	1330
1331	1331	$(help-board-dirs): help-%:
1332	1332	@echo 'Architecture specific targets ($(SRCARCH) $*):'
...	...	@@ -1580,11 +1580,6 @@
1580	1580	$(cmd_files): ; # Do not try to update included dependency files
1581	1581	include $(cmd_files)
1582	1582	endif
1583		-
1584		-# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir
1585		-# Usage:
1586		-# $(Q)$(MAKE) $(clean)=dir
1587		-clean := -f $(srctree)/scripts/Makefile.clean obj
1588	1583
1589	1584	endif # skip-makefile
1590	1585
...	...	@@ -185,6 +185,18 @@
185	185	# $(Q)$(MAKE) $(dtbinst)=dir
186	186	dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj
187	187
	188	+###
	189	+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=
	190	+# Usage:
	191	+# $(Q)$(MAKE) $(clean)=dir
	192	+clean := -f $(srctree)/scripts/Makefile.clean obj
	193	+
	194	+###
	195	+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.headersinst obj=
	196	+# Usage:
	197	+# $(Q)$(MAKE) $(hdr-inst)=dir
	198	+hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
	199	+
188	200	# Prefix -I with $(srctree) if it is not an absolute path.
189	201	# skip if -I has no parameter
190	202	addtree = $(if $(patsubst -I%,%,$(1)), \
...	...	@@ -7,10 +7,7 @@
7	7	PHONY := __clean
8	8	__clean:
9	9
10		-# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir
11		-# Usage:
12		-# $(Q)$(MAKE) $(clean)=dir
13		-clean := -f $(srctree)/scripts/Makefile.clean obj
	10	+include scripts/Kbuild.include
14	11
15	12	# The filename Kbuild has precedence over Makefile
16	13	kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
...	...	@@ -90,11 +87,6 @@
90	87	PHONY += $(subdir-ymn)
91	88	$(subdir-ymn):
92	89	$(Q)$(MAKE) $(clean)=$@
93		-
94		-# If quiet is set, only print short version of command
95		-
96		-cmd = @$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))' &&) $(cmd_$(1))
97		-
98	90
99	91	# Declare the contents of the .PHONY variable as phony. We keep that
100	92	# information in a variable se we can use it in if_changed and friends.
...	...	@@ -122,7 +122,6 @@
122	122	endif
123	123
124	124	# Recursion
125		-hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
126	125	.PHONY: $(subdirs)
127	126	$(subdirs):
128	127	$(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@
...	...	@@ -548,7 +548,7 @@
548	548	{
549	549	int i, j;
550	550	struct menu submenu[8], menu, *location = NULL;
551		- struct jump_key *jump;
	551	+ struct jump_key *jump = NULL;
552	552
553	553	str_printf(r, _("Prompt: %s\n"), _(prop->text));
554	554	menu = prop->menu->parent;
...	...	@@ -586,7 +586,7 @@
586	586	str_printf(r, _(" Location:\n"));
587	587	for (j = 4; --i >= 0; j += 2) {
588	588	menu = submenu[i];
589		- if (head && location && menu == location)
	589	+ if (jump && menu == location)
590	590	jump->offset = strlen(r->s);
591	591	str_printf(r, "%*c-> %s", j, ' ',
592	592	_(menu_get_prompt(menu)));