summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2015-12-10 15:53:06 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-30 10:18:35 +0200
commit252644d83bf7c46d199687c4af2f0ee125ca7f62 (patch)
tree1900fc494f2cb177fe2e55c40ff8cef8becb54f8 /Makefile
parentcf5fa7b898f487def896acaf79f3ea3bc4827e8c (diff)
kbuild: Do not run modules_install and install in paralel
commit a85a41ed69f27c4c667d8c418df14b4fb220c4ad upstream. Based on a x86-only patch by Andy Lutomirski <luto@amacapital.net> With modular kernels, 'make install' is going to need the installed modules at some point to generate the initramfs. Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a6512f4eec9f..4a1cd02fa3c3 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)
# ===========================================================================