Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+21
-23
+6
-11
Makefile
+6
-11
Makefile
···
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
···
1006
1005
1007
1006
$(version_h): $(srctree)/Makefile FORCE
1008
1007
$(call filechk,version.h)
1008
+
$(Q)rm -f $(old_version_h)
1009
1009
1010
1010
include/generated/utsrelease.h: include/config/kernel.release FORCE
1011
1011
$(call filechk,utsrelease.h)
···
1037
1035
1038
1036
#Default location for installed headers
1039
1037
export INSTALL_HDR_PATH = $(objtree)/usr
1040
-
1041
-
hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
1042
1038
1043
1039
# If we do an all arch process set dst to asm-$(hdr-arch)
1044
1040
hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
···
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
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
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
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
+12
scripts/Kbuild.include
+12
scripts/Kbuild.include
···
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)), \
+1
-9
scripts/Makefile.clean
+1
-9
scripts/Makefile.clean
···
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))
···
87
90
PHONY += $(subdir-ymn)
88
91
$(subdir-ymn):
89
92
$(Q)$(MAKE) $(clean)=$@
90
-
91
-
# If quiet is set, only print short version of command
92
-
93
-
cmd = @$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))' &&) $(cmd_$(1))
94
-
95
93
96
94
# Declare the contents of the .PHONY variable as phony. We keep that
97
95
# information in a variable se we can use it in if_changed and friends.