fix 2.6 modules pattern using a common LINUX_KMOD_SUFFIX variable,

fix alsa 2.6 build when arch != mipsel


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2311 3c298f89-4303-0410-b956-a3cf2f4a3e73

8 files changed, 21 insertions, 21 deletions

diff --git a/target/linux/package/alsa/Makefile b/target/linux/package/alsa/Makefile
index 7c08d06ca..f616fa077 100644
--- a/target/linux/package/alsa/Makefile
+++ b/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/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile
index 0240bdc71..39f5f38bc 100644
--- a/target/linux/package/fuse/Makefile
+++ b/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/target/linux/package/hostap/Makefile b/target/linux/package/hostap/Makefile
index c7d187bf3..06c063a5e 100644
--- a/target/linux/package/hostap/Makefile
+++ b/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/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile
index 18aeba38e..089e68e94 100644
--- a/target/linux/package/madwifi/Makefile
+++ b/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/target/linux/package/mini_fo/Makefile b/target/linux/package/mini_fo/Makefile
index f80c1d363..4ea3be838 100644
--- a/target/linux/package/mini_fo/Makefile
+++ b/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/target/linux/package/openswan/Makefile b/target/linux/package/openswan/Makefile
index 0e446902e..3ea5cf7c4 100644
--- a/target/linux/package/openswan/Makefile
+++ b/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/target/linux/package/shfs/Makefile b/target/linux/package/shfs/Makefile
index 3041826c0..ecb123872 100644
--- a/target/linux/package/shfs/Makefile
+++ b/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/target/linux/rules.mk b/target/linux/rules.mk
index 2c0fa09c5..f7e108658 100644
--- a/target/linux/rules.mk
+++ b/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)),)