From a85a41ed69f27c4c667d8c418df14b4fb220c4ad Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 10 Dec 2015 15:53:06 +0100 Subject: kbuild: Do not run modules_install and install in paralel Based on a x86-only patch by Andy Lutomirski With modular kernels, 'make install' is going to need the installed modules at some point to generate the initramfs. Signed-off-by: Michal Marek --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3a0234f50f36..b6b968e7f9dc 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,12 @@ ifeq ($(KBUILD_EXTMOD),) endif endif endif +# install and module_install need also be processed one by one +ifneq ($(filter install,$(MAKECMDGOALS)),) + ifneq ($(filter modules_install,$(MAKECMDGOALS)),) + mixed-targets := 1 + endif +endif ifeq ($(mixed-targets),1) # =========================================================================== -- cgit v1.2.3 From 40ab87a4003c7952976ce901a2b9ece5ed833168 Mon Sep 17 00:00:00 2001 From: Wang YanQing Date: Fri, 11 Dec 2015 00:35:19 +0800 Subject: Makefile: revert "Makefile: Document ability to make file.lst and file.S" partially Commit 627189797807 ("Makefile: Document ability to make file.lst and file.S") document ability to make file.S, but there isn't such ability in kbuild, so revert it. Signed-off-by: Wang YanQing Signed-off-by: Michal Marek --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b6b968e7f9dc..c8c36cef7e39 100644 --- a/Makefile +++ b/Makefile @@ -1265,7 +1265,7 @@ help: @echo ' firmware_install- Install all firmware to INSTALL_FW_PATH' @echo ' (default: $$(INSTALL_MOD_PATH)/lib/firmware)' @echo ' dir/ - Build all files in dir and below' - @echo ' dir/file.[oisS] - Build specified target only' + @echo ' dir/file.[ois] - Build specified target only' @echo ' dir/file.lst - Build specified mixed source/assembly target only' @echo ' (requires a recent binutils and recent build (System.map))' @echo ' dir/file.ko - Build module including final link' -- cgit v1.2.3