use $(curdir) again

[openwrt-10.03/.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 057faac99b25207cbb9414bef8c583829b920039..b758f1db2223456bb50761a563e8e589d20b8858 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -52,7 +52,6 @@ GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLAT
 
 define KernelPackage/Defaults
   FILES:=
-  KCONFIG:=m
   AUTOLOAD:=
 endef
 
@@ -91,7 +90,6 @@ define KernelPackage
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules
-    DEFAULT:=$(KMOD_DEFAULT)
     DESCRIPTION:=$(DESCRIPTION)
     EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
     $(call KernelPackage/$(1))
@@ -99,13 +97,13 @@ define KernelPackage
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
   endef
 
-  ifeq ($(findstring m,$(KCONFIG)),m)
+  ifeq ($(filter y,$(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))
+                 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