rootfs_split fixes

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 7a36cee..d27f8ac 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -4,27 +4,14 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 ifeq ($(DUMP),1)
-  KERNEL:=<KERNEL>
-  BOARD:=<BOARD>
-  LINUX_VERSION:=<LINUX_VERSION>
+  KERNEL?=<KERNEL>
+  BOARD?=<BOARD>
+  LINUX_VERSION?=<LINUX_VERSION>
 else
-
-  include $(TOPDIR)/.kernel.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
-  # 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
-
   ifeq ($(KERNEL),2.6)
     LINUX_KMOD_SUFFIX=ko
   else
@@ -39,21 +26,32 @@ else
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 
+  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)
 
   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
 
   LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
+
+  LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
+  TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
+  LINUX_SITE:=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING) \
+           http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING) \
+           http://www.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING) \
+           http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)$(TESTING)
+
+  PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 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:=
-  KCONFIG:=m
   AUTOLOAD:=
 endef
 
@@ -82,6 +80,7 @@ endef
 
 define KernelPackage
   NAME:=$(1)
+  $(eval $(call Package/Default))
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(KERNEL)))
@@ -91,74 +90,27 @@ define KernelPackage
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules
-    DEFAULT:=m
     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
 
-  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
+  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
   $$(eval $$(call BuildPackage,kmod-$(1)))
+
+  $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))
 endef
 
 define AutoLoad
   add_module $(1) "$(2)";
 endef
 
-
-# FIXME: remove this crap
-define KMOD_template
-ifeq ($$(strip $(4)),)
-KDEPEND_$(1):=m
-else
-KDEPEND_$(1):=$($(4))
-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)
-
-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
-
-$$(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)
-endef
-