fix pcmcia submenu (broken by [8520])

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 1ab85d4..b3eec97 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -4,28 +4,17 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

+
+include $(INCLUDE_DIR)/kernel-version.mk
+

 ifeq ($(DUMP),1)
 ifeq ($(DUMP),1)

-  KERNEL:=<KERNEL>
-  BOARD:=<BOARD>
-  LINUX_VERSION:=<LINUX_VERSION>
+  KERNEL?=<KERNEL>
+  BOARD?=<BOARD>
+  LINUX_VERSION?=<LINUX_VERSION>

 else
 else

-
-  include $(TOPDIR)/.kernel.mk

   include $(INCLUDE_DIR)/target.mk
 
   include $(INCLUDE_DIR)/target.mk
 

-  # check to see if .kernel.mk matches target.mk
-  ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL))
-     LINUX_VERSION:=$(CONFIG_LINUX_VERSION)
-     LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE)
-     LINUX_KARCH:=$(CONFIG_LINUX_KARCH)
-  else
-    ifneq ($(KERNEL_BUILD),1)
-      # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
-      $(warning rebuilding .kernel.mk)
-      $(TOPDIR)/.kernel.mk: FORCE
-               @$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null
-    endif
-  endif
+  export GCC_HONOUR_COPTS=s

 
   ifeq ($(KERNEL),2.6)
     LINUX_KMOD_SUFFIX=ko
 
   ifeq ($(KERNEL),2.6)
     LINUX_KMOD_SUFFIX=ko


@@ -41,20 +30,28 @@ else
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 

-  KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-  LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
+  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)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)

-  MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR)

   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 
   LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 
   LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux

+
+  LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
+  TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
+  LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) \
+
+  PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 endif
 endif

+GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
+GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )

 
 
 define KernelPackage/Defaults
   FILES:=
 
 
 define KernelPackage/Defaults
   FILES:=

-  KCONFIG:=m

   AUTOLOAD:=
 endef
 
   AUTOLOAD:=
 endef
 


@@ -83,6 +80,7 @@ endef
 
 define KernelPackage
   NAME:=$(1)
 
 define KernelPackage
   NAME:=$(1)

+  $(eval $(call Package/Default))

   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))


@@ -92,25 +90,32 @@ define KernelPackage
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules

-    DEFAULT:=m

     DESCRIPTION:=$(DESCRIPTION)
     DESCRIPTION:=$(DESCRIPTION)

-    EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))'
+    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))

     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
   endef
 
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(KERNEL))
     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
   endef
 

-  ifeq ($(findstring m,$(KCONFIG)),m)
+  ifdef KernelPackage/$(1)/description
+    define Package/kmod-$(1)/description
+$(call KernelPackage/$(1)/description)
+    endef
+  endif
+
+  ifneq ($(if $(KCONFIG),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)

     ifneq ($(strip $(FILES)),)
       define Package/kmod-$(1)/install
     ifneq ($(strip $(FILES)),)
       define Package/kmod-$(1)/install

-               mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
-               $(CP) $$(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
   $$(eval $$(call BuildPackage,kmod-$(1)))
       endef
     endif
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))

+
+  $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))

 endef
 
 define AutoLoad
 endef
 
 define AutoLoad