Revert
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk
index 2f5f05e..c4a11a6 100644
--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -56,18 +56,17 @@
KERNEL_MODULES_DEP := $(firstword $(wildcard $(TARGET_OUT)/lib/modules/*/modules.dep))
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)
+$(TARGET_OUT_INTERMEDIATES)/%.kmodule: $(INSTALLED_KERNEL_TARGET)
+ $(hide) cp -an $(EXTRA_KERNEL_MODULE_PATH_$*) $(TARGET_OUT_INTERMEDIATES)/$*.kmodule
@echo Building additional kernel module $*
- $(hide) mkdir -p $(@D) && $(ACP) -fr $(EXTRA_KERNEL_MODULE_PATH_$*) $(@D)
$(mk_kernel) M=$(abspath $@) modules
-$(KERNEL_MODULES_DEP): $(INSTALLED_KERNEL_TARGET) $(ALL_EXTRA_MODULES)
+$(KERNEL_MODULES_DEP): $(INSTALLED_KERNEL_TARGET) $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/%.kmodule,$(TARGET_EXTRA_KERNEL_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 \
echo Installing additional kernel module $${kmod} ; \
- $(subst +,,$(subst $(hide),,$(mk_kernel))) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/kmodule/$${kmod} modules_install ; \
+ $(subst +,,$(subst $(hide),,$(mk_kernel))) INSTALL_MOD_PATH=$(abspath $(TARGET_OUT)) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/$${kmod}.kmodule modules_install ; \
done
$(hide) rm -f $(TARGET_OUT)/lib/modules/*/{build,source}
endif
@@ -76,10 +75,7 @@
# rules to get source of Broadcom 802.11a/b/g/n hybrid device driver
# based on broadcomsetup.sh of Kyle Evans
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/broadcom/wl
-ifeq ($(wildcard $(WL_PATH)/build.mk),)
- WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl
-endif
+WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl
-include $(WL_PATH)/build.mk
installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)