upgrade madwifi-ng snapshot to r1329-20051121

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

diff --git a/openwrt/target/linux/rules.mk b/openwrt/target/linux/rules.mk
index 2c0fa09..8871fa4 100644 (file)
--- a/openwrt/target/linux/rules.mk
+++ b/openwrt/target/linux/rules.mk
@@ -4,6 +4,11 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/sh[234]/sh/' \
 )
 
        -e 's/sh[234]/sh/' \
 )
 

+ifeq ($(KERNEL),2.6)
+LINUX_KMOD_SUFFIX=ko
+else
+LINUX_KMOD_SUFFIX=o
+endif

 
 define KMOD_template
 ifeq ($$(strip $(4)),)
 
 define KMOD_template
 ifeq ($$(strip $(4)),)


@@ -12,11 +17,7 @@ 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)-$(PKG_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)-$(PKG_RELEASE)_$(ARCH).ipk
 I_$(1) := $(PKG_BUILD_DIR)/ipkg/$(2)


@@ -32,10 +33,12 @@ 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)
        echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control
        $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(PKG_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)
        cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION)

+endif

 ifneq ($(6),)
        mkdir -p $$(I_$(1))/etc/modules.d
        for module in $(7); do \
 ifneq ($(6),)
        mkdir -p $$(I_$(1))/etc/modules.d
        for module in $(7); do \