change the build order in target/linux so that it's possible to link the kernel with...

[openwrt.git] / target / linux / rules.mk

diff --git a/target/linux/rules.mk b/target/linux/rules.mk
index 9446c34..c9cf9c5 100644 (file)
--- a/target/linux/rules.mk
+++ b/target/linux/rules.mk
@@ -1,3 +1,46 @@
+KERNEL:=unknown
+ifneq (,$(findstring 2.4.,$(LINUX_VERSION)))
+KERNEL:=2.4
+endif
+ifneq (,$(findstring 2.6.,$(LINUX_VERSION)))
+KERNEL:=2.6
+endif
+
+MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
+
+LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+LINUX_DIR := $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)
+LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux
+
+LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root
+IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+
+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/' \
+)
+
+KPKG_MAKEOPTS:=        IPKG="$(IPKG_KERNEL)" \
+               BOARD="$(BOARD)" \
+               KERNEL="$(KERNEL)" \
+               TARGET_DIR="$(LINUX_TARGET_DIR)" \
+               LINUX_BUILD_DIR="$(LINUX_BUILD_DIR)" \
+               LINUX_DIR="$(LINUX_DIR)" \
+               LINUX_VERSION="$(LINUX_VERSION)" \
+               LINUX_RELEASE="$(LINUX_RELEASE)"
+
+KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
+MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
+TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
+
+ifeq ($(KERNEL),2.6)
+LINUX_KMOD_SUFFIX=ko
+else
+LINUX_KMOD_SUFFIX=o
+endif
+

 define KMOD_template
 ifeq ($$(strip $(4)),)
 KDEPEND_$(1):=m
 define KMOD_template
 ifeq ($$(strip $(4)),)
 KDEPEND_$(1):=m


@@ -5,14 +48,10 @@ else
 KDEPEND_$(1):=$($(4))
 endif
 
 KDEPEND_$(1):=$($(4))
 endif
 

-ifeq ($$(strip $(5)),)
-IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE))
-else
-IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)), $(5)
-endif
+IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) $(foreach pkg,$(5),", $(pkg)")

 
 

-PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk
-I_$(1) := $(PKG_BUILD_DIR)/ipkg/$(2)
+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 ($(BR2_PACKAGE_KMOD_$(1)),)
 
 ifeq ($$(KDEPEND_$(1)),m)
 ifneq ($(BR2_PACKAGE_KMOD_$(1)),)


@@ -25,10 +64,24 @@ endif
 
 $$(PKG_$(1)): $(LINUX_DIR)/.modules_done
        rm -rf $$(I_$(1))
 
 $$(PKG_$(1)): $(LINUX_DIR)/.modules_done
        rm -rf $$(I_$(1))

-       mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION)
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH)
+       $(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
        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)
        cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION)

-       $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
+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
+endif
+       $(8)
+       $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(MAKE_TRACE)

 
 endef
 
 endef

+
+KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk
+INSTALL_TARGETS := $(KERNEL_IPKG)
+TARGETS := 
+