kernel.mk: install modules for 'kernel' goal

[android-x86/build.git] / core / tasks / kernel.mk

diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk
index 1191485..89377f1 100644 (file)
--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -45,15 +45,15 @@ KERNEL_DOTCONFIG_FILE := $(KBUILD_OUTPUT)/.config
 KERNEL_ARCH_CHANGED := $(if $(filter 0,$(shell grep -s ^$(if $(filter x86,$(TARGET_KERNEL_ARCH)),\#.)CONFIG_64BIT $(KERNEL_DOTCONFIG_FILE) | wc -l)),FORCE)
 $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED)
        $(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
-       $(mk_kernel) oldnoconfig
+       $(hide) ln -sf ../../../../../../external $(@D)
+       $(mk_kernel) olddefconfig
 
 # bison is needed to build kernel and external modules from source
 BISON := $(HOST_OUT_EXECUTABLES)/bison$(HOST_EXECUTABLE_SUFFIX)
 
 BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET)
-$(INSTALLED_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(ACP) $(BISON)
+$(BUILT_KERNEL_TARGET): $(KERNEL_DOTCONFIG_FILE) | $(BISON)
        $(mk_kernel) $(KERNEL_TARGET) $(if $(MOD_ENABLED),modules)
-       $(hide) $(ACP) -fp $(BUILT_KERNEL_TARGET) $@
        $(if $(FIRMWARE_ENABLED),$(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) firmware_install)
 
 ifneq ($(MOD_ENABLED),)
@@ -61,12 +61,12 @@ KERNEL_MODULES_DEP := $(firstword $(wildcard $(TARGET_OUT)/lib/modules/*/modules
 KERNEL_MODULES_DEP := $(if $(KERNEL_MODULES_DEP),$(KERNEL_MODULES_DEP),$(TARGET_OUT)/lib/modules)
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
-$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(INSTALLED_KERNEL_TARGET)
+$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(BUILT_KERNEL_TARGET)
        @echo Building additional kernel module $*
        $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D)
-       $(mk_kernel) M=$(abspath $@) modules
+       $(mk_kernel) M=$(abspath $@) modules || ( rm -rf $@ && exit 1 )
 
-$(KERNEL_MODULES_DEP): $(INSTALLED_KERNEL_TARGET) $(ALL_EXTRA_MODULES)
+$(KERNEL_MODULES_DEP): $(BUILT_KERNEL_TARGET) $(ALL_EXTRA_MODULES)
        $(hide) rm -rf $(TARGET_OUT)/lib/modules
        $(mk_kernel) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) modules_install
        $(hide) for kmod in $(TARGET_EXTRA_KERNEL_MODULES) ; do \
@@ -88,19 +88,19 @@ endif
 
 installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 
-TARGET_PREBUILT_KERNEL := $(INSTALLED_KERNEL_TARGET)
+TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)
 
 .PHONY: kernel $(if $(KERNEL_ARCH_CHANGED),$(KERNEL_HEADERS_COMMON)/linux/binder.h)
-kernel: $(TARGET_PREBUILT_KERNEL)
+kernel: $(INSTALLED_KERNEL_TARGET) $(KERNEL_MODULES_DEP)
 
-else
+endif # TARGET_PREBUILT_KERNEL
 
+ifndef CM_BUILD
 $(INSTALLED_KERNEL_TARGET): $(TARGET_PREBUILT_KERNEL) | $(ACP)
        $(copy-file-to-new-target)
 ifdef TARGET_PREBUILT_MODULES
        mkdir -p $(TARGET_OUT)/lib
        $(hide) cp -r $(TARGET_PREBUILT_MODULES) $(TARGET_OUT)/lib
 endif
-
-endif # TARGET_PREBUILT_KERNEL
+endif # CM_BUILD
 endif # KBUILD_OUTPUT