summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2015-12-10 17:53:06 +0300
committerJiri Slaby <jslaby@suse.cz>2016-10-06 09:21:51 +0300
commit7e87d5a7b7c880a6d540314fcb36e39dc7520351 (patch)
tree7fbe9d4abb5fe288ccfd37cd442b49827ec58f86 /Makefile
parent341ec0a305e2e64d67f346c09445c7328579f120 (diff)
downloadlinux-7e87d5a7b7c880a6d540314fcb36e39dc7520351.tar.xz
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4c1baa9b6bae..832dd3d27f39 100644
--- a/Makefile
+++ b/Makefile
@@ -476,6 +476,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)
# ===========================================================================