finally kill KMOD_template - removes a big chunk of legacy build code

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 2c5d093..af5d945 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -9,78 +9,109 @@ ifeq ($(DUMP),1)
   BOARD:=<BOARD>
   LINUX_VERSION:=<LINUX_VERSION>
 else
--include $(TOPDIR)/.kernel.mk
 
-ifneq (,$(findstring 2.4.,$(LINUX_VERSION)))
-KERNEL:=2.4
-LINUX_KMOD_SUFFIX=o
-endif
-ifneq (,$(findstring 2.6.,$(LINUX_VERSION)))
-KERNEL:=2.6
-LINUX_KMOD_SUFFIX=ko
-endif
+  include $(TOPDIR)/.kernel.mk
+  include $(INCLUDE_DIR)/target.mk
 
-LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-       -e 's/mipsel/mips/' \
-       -e 's/mipseb/mips/' \
-       -e 's/powerpc/ppc/' \
-       -e 's/sh[234]/sh/' \
-       -e 's/armeb/arm/' \
-)
+  # 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
+  # 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
 
-KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+  ifeq ($(KERNEL),2.6)
+    LINUX_KMOD_SUFFIX=ko
+  else
+    LINUX_KMOD_SUFFIX=o
+  endif
 
-MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
-MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR)
-TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
-KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules
+  ifneq (,$(findstring uml,$(BOARD)))
+    KERNEL_CC:=$(HOSTCC)
+    KERNEL_CROSS:=
+  else
+    KERNEL_CC:=$(TARGET_CC)
+    KERNEL_CROSS:=$(TARGET_CROSS)
+  endif
 
-LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
-endif
+  KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+  LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
-# FIXME: remove this crap
-define KMOD_template
-ifeq ($$(strip $(4)),)
-KDEPEND_$(1):=m
-else
-KDEPEND_$(1):=$($(4))
+  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
 endif
 
-IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) $(foreach pkg,$(5),", $(pkg)")
 
-PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk
-I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2)
+define KernelPackage/Defaults
+  FILES:=
+  KCONFIG:=m
+  AUTOLOAD:=
+endef
 
-ifeq ($$(KDEPEND_$(1)),m)
-ifneq ($$(CONFIG_PACKAGE_KMOD_$(1)),)
-TARGETS += $$(PKG_$(1))
-endif
-ifeq ($$(CONFIG_PACKAGE_KMOD_$(1)),y)
-INSTALL_TARGETS += $$(PKG_$(1))
-endif
-endif
+define ModuleAutoLoad
+       export modules=; \
+       add_module() { \
+               mkdir -p $(2)/etc/modules.d; \
+               ( \
+                       for mod in $$$$$$$$2; do \
+                               getvar mod; \
+                       done \
+               ) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \
+               modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \
+       }; \
+       $(3) \
+       if [ -n "$$$$$$$$modules" ]; then \
+               mkdir -p $(2)/etc/modules.d; \
+               echo "#!/bin/sh" > $(2)/CONTROL/postinst; \
+               echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \
+               echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \
+               echo "load_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \
+               chmod 0755 $(2)/CONTROL/postinst; \
+       fi
+endef
+ 
 
-$$(PKG_$(1)): $(LINUX_DIR)/.modules_done
-       rm -rf $$(I_$(1))
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH)
-       echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control
-ifneq ($(strip $(3)),)
-       mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION)
-       $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION)
-endif
-ifneq ($(6),)
-       mkdir -p $$(I_$(1))/etc/modules.d
-       for module in $(7); do \
-               echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \
-       done
-       echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst
-       echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst
-       echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst
-       echo "load_modules /etc/modules.d/$(6)-$(2)" >> $$(I_$(1))/CONTROL/postinst
-       chmod 0755 $$(I_$(1))/CONTROL/postinst
-endif
-       $(8)
-       $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
+define KernelPackage
+  NAME:=$(1)
+  $(eval $(call KernelPackage/Defaults))
+  $(eval $(call KernelPackage/$(1)))
+  $(eval $(call KernelPackage/$(1)/$(KERNEL)))
+  $(eval $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL)))
+
+  define Package/kmod-$(1)
+    TITLE:=$(TITLE)
+    SECTION:=kernel
+    CATEGORY:=Kernel modules
+    DEFAULT:=m
+    DESCRIPTION:=$(DESCRIPTION)
+    EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))'
+    $(call KernelPackage/$(1))
+    $(call KernelPackage/$(1)/$(KERNEL))
+    $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
+  endef
+
+  ifeq ($(findstring m,$(KCONFIG)),m)
+    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))
+      endef
+    endif
+  endif
+  $$(eval $$(call BuildPackage,kmod-$(1)))
+endef
+
+define AutoLoad
+  add_module $(1) "$(2)";
 endef