replace xargs commands with $(XARGS)

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index d27f8ac..df859a4 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -12,6 +12,8 @@ ifeq ($(DUMP),1)
 else
   include $(INCLUDE_DIR)/target.mk
 
+  export GCC_HONOUR_COPTS=s
+
   ifeq ($(KERNEL),2.6)
     LINUX_KMOD_SUFFIX=ko
   else
@@ -28,9 +30,9 @@ else
 
   KERNEL_PATCHVER:=$(shell echo $(LINUX_VERSION) | cut -d. -f1,2,3 | cut -d- -f1)
   PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
-  PATCH_DIR := ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
-  KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-  LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+  PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(KERNEL)-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
@@ -97,13 +99,15 @@ define KernelPackage
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
   endef
 
-  ifneq ($(strip $(FILES)),)
-    define Package/kmod-$(1)/install
-         mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
-         $(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
-         $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
-         $(call KernelPackage/$(1)/install,$$(1))
-    endef
+  ifneq ($(if $(KCONFIG),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
+    ifneq ($(strip $(FILES)),)
+      define Package/kmod-$(1)/install
+                 mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
+                 $(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
+                 $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
+                 $(call KernelPackage/$(1)/install,$$(1))
+      endef
+    endif
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))