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

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

diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile
index e245f68..732cd45 100644 (file)
--- a/openwrt/target/linux/package/madwifi/Makefile
+++ b/openwrt/target/linux/package/madwifi/Makefile
@@ -28,6 +28,12 @@ ifeq ($(ARCH),i386)
 HAL_TARGET:=i386-elf
 endif
 
 HAL_TARGET:=i386-elf
 endif
 

+ifeq ($(LINUX_VERSION),2.4.30)
+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))))
 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))))


@@ -50,10 +56,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
        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*.o \
-               $(PKG_BUILD_DIR)/ath_hal/ath_hal.o \
-               $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.o \
-               $(PKG_BUILD_DIR)/ath/ath_pci.o \
+       cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(MODUL_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(MODUL_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(MODUL_SUFFIX) \
+               $(PKG_BUILD_DIR)/ath/ath_pci.$(MODUL_SUFFIX) \

                $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
 
                $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR)
 

diff --git a/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch b/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
index d1be56b..cfd4e9a 100644 (file)
--- a/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
+++ b/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch
@@ -18,5 +18,5 @@ diff -urN madwifi.old/hal/public/mips-le-elf.inc madwifi.dev/hal/public/mips-le-
  LDOPTS=       -EL
  COPTS+=       -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
 -COPTS+=       -G 0 -EL -mno-abicalls -fno-pic -mips2 -Wa,--trap \
  LDOPTS=       -EL
  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 -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