install correct modules on 2.6 system, remove -EL from COPTS

SVN-Revision: 1880
This commit is contained in:
Waldemar Brodkorb 2005-09-08 12:38:08 +00:00
parent 32ffd49fa1
commit 54aa8c84c8
2 changed files with 11 additions and 5 deletions

View File

@ -28,6 +28,12 @@ ifeq ($(ARCH),i386)
HAL_TARGET:=i386-elf HAL_TARGET:=i386-elf
endif endif
ifeq ($(LINUX_VERSION),2.4.30)
MODUL_SUFFIX=o
else
MODUL_SUFFIX=ko
endif
include $(TOPDIR)/package/rules.mk 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)))) $(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE))))
@ -50,10 +56,10 @@ $(IPKG_KMOD_MADWIFI):
mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION) mkdir -p $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)
install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi 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 install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.o \ cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(MODUL_SUFFIX) \
$(PKG_BUILD_DIR)/ath_hal/ath_hal.o \ $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(MODUL_SUFFIX) \
$(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.o \ $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(MODUL_SUFFIX) \
$(PKG_BUILD_DIR)/ath/ath_pci.o \ $(PKG_BUILD_DIR)/ath/ath_pci.$(MODUL_SUFFIX) \
$(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/ $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
$(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)

View File

@ -18,5 +18,5 @@ diff -urN madwifi.old/hal/public/mips-le-elf.inc madwifi.dev/hal/public/mips-le-
LDOPTS= -EL LDOPTS= -EL
COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
-COPTS+= -G 0 -EL -mno-abicalls -fno-pic -mips2 -Wa,--trap \ -COPTS+= -G 0 -EL -mno-abicalls -fno-pic -mips2 -Wa,--trap \
+COPTS+= -G 0 -EL -mno-abicalls -fno-pic -mips32 -Wa,--trap \ +COPTS+= -G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls