[adm5120] add packages required by failsafe support to defaults

[openwrt.git] / include / kernel.mk

diff --git a/include/kernel.mk b/include/kernel.mk
index 407109f..7d986e4 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -5,13 +5,15 @@
 # See /LICENSE for more information.
 #
 
 # See /LICENSE for more information.
 #
 

+ifeq ($(__target_inc),)
+  include $(INCLUDE_DIR)/target.mk
+endif
+

 ifeq ($(DUMP),1)
   KERNEL?=<KERNEL>
   BOARD?=<BOARD>
   LINUX_VERSION?=<LINUX_VERSION>
 else
 ifeq ($(DUMP),1)
   KERNEL?=<KERNEL>
   BOARD?=<BOARD>
   LINUX_VERSION?=<LINUX_VERSION>
 else

-  include $(INCLUDE_DIR)/target.mk
-

   export GCC_HONOUR_COPTS=s
 
   ifeq ($(KERNEL),2.6)
   export GCC_HONOUR_COPTS=s
 
   ifeq ($(KERNEL),2.6)


@@ -21,18 +23,17 @@ else
   endif
 
   ifneq (,$(findstring uml,$(BOARD)))
   endif
 
   ifneq (,$(findstring uml,$(BOARD)))

-    KERNEL_CC:=$(HOSTCC)
-    KERNEL_CROSS:=
+    KERNEL_CC?=$(HOSTCC)
+    KERNEL_CROSS?=

   else
   else

-    KERNEL_CC:=$(TARGET_CC)
-    KERNEL_CROSS:=$(TARGET_CROSS)
+    KERNEL_CC?=$(TARGET_CC)
+    KERNEL_CROSS?=$(TARGET_CROSS)

   endif
 
   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)
+  PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+  FILES_DIR ?= ./files$(shell [ -d "./files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(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)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)


@@ -41,15 +42,25 @@ else
 
   LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
   TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
 
   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)
+  LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) \

 
 

-  PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+  ifneq ($(TARGET_BUILD),1)
+    PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+  endif
+endif
+
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=um
+else
+  ifeq (,$(LINUX_KARCH))
+    LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
+         -e 's/mipsel/mips/' \
+         -e 's/mipseb/mips/' \
+         -e 's/sh[234]/sh/' \
+         -e 's/armeb/arm/' \
+    )
+  endif

 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
 
 
 define KernelPackage/Defaults


@@ -78,7 +89,10 @@ define ModuleAutoLoad
                chmod 0755 $(2)/CONTROL/postinst; \
        fi
 endef
                chmod 0755 $(2)/CONTROL/postinst; \
        fi
 endef

- 
+
+ifeq ($(DUMP)$(TARGET_BUILD),)
+  -include $(LINUX_DIR)/.config
+endif

 
 define KernelPackage
   NAME:=$(1)
 
 define KernelPackage
   NAME:=$(1)


@@ -94,12 +108,25 @@ define KernelPackage
     CATEGORY:=Kernel modules
     DESCRIPTION:=$(DESCRIPTION)
     EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
     CATEGORY:=Kernel modules
     DESCRIPTION:=$(DESCRIPTION)
     EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))

+    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(BOARD)-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(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 ($(filter y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),)
+  ifdef KernelPackage/$(1)/description
+    define Package/kmod-$(1)/description
+$(call KernelPackage/$(1)/description)
+    endef
+  endif
+
+  ifdef KernelPackage/$(1)/config
+    define Package/kmod-$(1)/config
+$(call KernelPackage/$(1)/config)
+    endef
+  endif
+
+  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)
     ifneq ($(strip $(FILES)),)
       define Package/kmod-$(1)/install
                  mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)


@@ -108,6 +135,12 @@ define KernelPackage
                  $(call KernelPackage/$(1)/install,$$(1))
       endef
     endif
                  $(call KernelPackage/$(1)/install,$$(1))
       endef
     endif

+  $(if $(CONFIG_PACKAGE_kmod-$(1)),
+    else
+      compile: kmod-$(1)-unavailable
+      kmod-$(1)-unavailable:
+               @echo "WARNING: kmod-$(1) is not available in the kernel config"
+  )

   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
 
   endif
   $$(eval $$(call BuildPackage,kmod-$(1)))
 


@@ -118,3 +151,7 @@ define AutoLoad
   add_module $(1) "$(2)";
 endef
 
   add_module $(1) "$(2)";
 endef
 

+define CompareKernelPatchVer
+  $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
+endef
+