fix 2.6 modules pattern using a common LINUX_KMOD_SUFFIX variable,

fix alsa 2.6 build when arch != mipsel

SVN-Revision: 2311

diff --git a/openwrt/target/linux/package/alsa/Makefile b/openwrt/target/linux/package/alsa/Makefile
index 7c08d06ca5daea94a9765a204017c6baa7b2ca78..f616fa077f8b515bde3c9131f0a112312ad2cfb8 100644 (file)
--- a/openwrt/target/linux/package/alsa/Makefile
+++ b/openwrt/target/linux/package/alsa/Makefile
@@ -43,6 +43,7 @@ $(PKG_BUILD_DIR)/.configured:
 
 $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               ARCH="$(LINUX_KARCH)" \
                c_opts="$(KERNEL_C_OPTS)"
        touch $@
 
@@ -50,6 +51,6 @@ $(IPKG_KMOD_ALSA):
        install -d -m0755 $(IDIR_KMOD_ALSA)/etc/modules.d
        install -m0644 ./files/alsa.modules $(IDIR_KMOD_ALSA)/etc/modules.d/70-alsa
        install -d -m0755 $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)
-       install -m0644 $(PKG_BUILD_DIR)/modules/*.o \
+       install -m0644 $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_ALSA) $(PACKAGE_DIR)

diff --git a/openwrt/target/linux/package/fuse/Makefile b/openwrt/target/linux/package/fuse/Makefile
index 0240bdc717d5c84ed650c924771d2808002a5d7e..39f5f38bc5258f7c150df236921c96ef536f1e54 100644 (file)
--- a/openwrt/target/linux/package/fuse/Makefile
+++ b/openwrt/target/linux/package/fuse/Makefile
@@ -77,7 +77,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_KMOD_FUSE):
        mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)
-       cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.* \
+       cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
 

diff --git a/openwrt/target/linux/package/hostap/Makefile b/openwrt/target/linux/package/hostap/Makefile
index c7d187bf3ad8be4861f8ec106b5ccb198096dee1..06c063a5eac653a82b4eaebe21a002622b1dee55 100644 (file)
--- a/openwrt/target/linux/package/hostap/Makefile
+++ b/openwrt/target/linux/package/hostap/Makefile
@@ -38,10 +38,10 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_KMOD_HOSTAP):
        install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)
        cp -fpR \
-               $(PKG_BUILD_DIR)/driver/modules/hostap.o \
-               $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.o \
-               $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.o \
-               $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.o \
+               $(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION)/
        $(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP)
        $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP) $(PACKAGE_DIR)
@@ -49,7 +49,7 @@ $(IPKG_KMOD_HOSTAP):
 $(IPKG_KMOD_HOSTAP_PCI):
        install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)
        cp -fpR \
-               $(PKG_BUILD_DIR)/driver/modules/hostap_pci.o \
+               $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/
        $(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP_PCI)
        $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR)
@@ -57,7 +57,7 @@ $(IPKG_KMOD_HOSTAP_PCI):
 $(IPKG_KMOD_HOSTAP_PLX):
        install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)
        cp -fpR \
-               $(PKG_BUILD_DIR)/driver/modules/hostap_plx.o \
+               $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/
        $(RSTRIP_KMOD) $(IDIR_KMOD_HOSTAP_PLX)
        $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR)

diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile
index 18aeba38e79eda9d9889021944df42f8c27ab7a5..089e68e948fdbacec97c7457992308c80a4f7f8a 100644 (file)
--- a/openwrt/target/linux/package/madwifi/Makefile
+++ b/openwrt/target/linux/package/madwifi/Makefile
@@ -28,12 +28,6 @@ ifeq ($(ARCH),i386)
 HAL_TARGET:=i386-elf
 endif
 
-ifeq ($(KERNEL),2.4)
-MODUL_SUFFIX=o
-else
-MODUL_SUFFIX=ko
-endif
-
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE))))
@@ -56,10 +50,10 @@ $(IPKG_KMOD_MADWIFI):
        mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)
        install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi
        install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
-       cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(MODUL_SUFFIX) \
-               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(MODUL_SUFFIX) \
-               $(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(MODUL_SUFFIX) \
-               $(PKG_BUILD_DIR)/ath/ath_pci.$(MODUL_SUFFIX) \
+       cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(LINUX_KMOD_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) \
                $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
 

diff --git a/openwrt/target/linux/package/mini_fo/Makefile b/openwrt/target/linux/package/mini_fo/Makefile
index f80c1d3639827bf650e629bcd881f5862618da64..4ea3be8380eb20ebff5ab890e8c36231de97c721 100644 (file)
--- a/openwrt/target/linux/package/mini_fo/Makefile
+++ b/openwrt/target/linux/package/mini_fo/Makefile
@@ -39,7 +39,7 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_KMOD_MINI_FO):
        install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)
        install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d
-       cp -fpR $(PKG_BUILD_DIR)/mini_fo.o \
+       cp -fpR $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \
         $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/
        echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo
        $(RSTRIP_KMOD) $(IDIR_KMOD_MINI_FO)

diff --git a/openwrt/target/linux/package/openswan/Makefile b/openwrt/target/linux/package/openswan/Makefile
index 0e446902ec31db34d026e6d9392db31a49d020ec..3ea5cf7c4f76c88c87282398e1640720433b0c8c 100644 (file)
--- a/openwrt/target/linux/package/openswan/Makefile
+++ b/openwrt/target/linux/package/openswan/Makefile
@@ -33,5 +33,5 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_KMOD_OPENSWAN):
        mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)
-       cp $(PKG_BUILD_DIR)/modobj/ipsec.*o $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/
+       cp -fpR $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR)

diff --git a/openwrt/target/linux/package/shfs/Makefile b/openwrt/target/linux/package/shfs/Makefile
index 3041826c086b41a167dfe34cfffa7cf4d3b105e6..ecb123872db947519dec8069de633384a6b2916c 100644 (file)
--- a/openwrt/target/linux/package/shfs/Makefile
+++ b/openwrt/target/linux/package/shfs/Makefile
@@ -43,7 +43,7 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_KMOD_SHFS):
        install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)
-       cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.*o \
+       cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \
         $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
        $(RSTRIP_KMOD) $(IDIR_KMOD_SHFS)
        $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)

diff --git a/openwrt/target/linux/rules.mk b/openwrt/target/linux/rules.mk
index 2c0fa09c5dd28e15e999505e1538565dd83d8cf1..f7e108658c1e3d6da8f4b72f9e5f5f8b93a59ad8 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/' \
 )
 
+ifeq ($(KERNEL),2.6)
+LINUX_KMOD_SUFFIX=ko
+else
+LINUX_KMOD_SUFFIX=o
+endif
 
 define KMOD_template
 ifeq ($$(strip $(4)),)