From 24dc1f527d33afc44998f5b35a8de368c165f51d Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 1 Nov 2005 17:30:26 +0000 Subject: 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@2311 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/package/madwifi/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'openwrt/target/linux/package/madwifi') diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile index 18aeba38e..089e68e94 100644 --- 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) -- cgit v1.2.3