Author: oget Update of /cvs/free/rpms/rt2860-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv21987 Modified Files: .cvsignore rt2860-add-network-mgr-support.diff rt2860-dat-install-fixes.patch rt2860-kmod.spec rt2860-no2.4-in-kernelversion.patch sources Removed Files: rt2860-2.6.31-compile.patch rt2860-remove-tftpboot-copy.patch Log Message: * Fri May 07 2010 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.0-1 - version update (2.3.0.0) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 May 2009 16:30:17 -0000 1.6 +++ .cvsignore 7 May 2010 07:17:01 -0000 1.7 @@ -1 +1 @@ -2009_0521_RT2860_Linux_STA_V2.1.2.0.tgz +2010_01_29_RT2860_Linux_STA_v2.3.0.0.tar.bz2 rt2860-add-network-mgr-support.diff: config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: rt2860-add-network-mgr-support.diff =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-add-network-mgr-support.diff,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rt2860-add-network-mgr-support.diff 21 Apr 2009 03:11:31 -0000 1.3 +++ rt2860-add-network-mgr-support.diff 7 May 2010 07:17:02 -0000 1.4 @@ -1,17 +1,16 @@ ---- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/config.mk 2009-03-26 20:20:43.000000000 -0400 -+++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/config.mk 2009-04-20 21:26:04.000000000 -0400 -@@ -6,12 +6,12 @@ HAS_28xx_QA=n +diff -rupN 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/os/linux/config.mk 2010_01_29_RT2860_Linux_STA_v2.3.0.0/os/linux/config.mk +--- 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/os/linux/config.mk 2009-12-25 02:04:28.000000000 -0500 ++++ 2010_01_29_RT2860_Linux_STA_v2.3.0.0/os/linux/config.mk 2010-04-22 02:35:11.000000000 -0400 +@@ -8,10 +8,10 @@ HAS_QA_SUPPORT=n + HAS_XLINK=n - #ifdef WPA_SUPPLICANT_SUPPORT # Support Wpa_Supplicant -HAS_WPA_SUPPLICANT=n +HAS_WPA_SUPPLICANT=y - #endif // WPA_SUPPLICANT_SUPPORT // - #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT # Support Native WpaSupplicant for Network Maganger -HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n +HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y - #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // #Support Net interface block while Tx-Sw queue full + HAS_BLOCK_NET_IF=n rt2860-dat-install-fixes.patch: Makefile.6 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) Index: rt2860-dat-install-fixes.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-dat-install-fixes.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rt2860-dat-install-fixes.patch 21 Apr 2009 03:11:31 -0000 1.3 +++ rt2860-dat-install-fixes.patch 7 May 2010 07:17:02 -0000 1.4 @@ -1,48 +1,7 @@ -diff -rupN DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.4 DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.4 ---- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.4 2009-03-25 03:42:46.000000000 -0400 -+++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.4 2009-04-20 21:21:26.000000000 -0400 -@@ -1,8 +1,6 @@ - include $(RT28xx_DIR)/os/linux/config.mk - - MOD_NAME = rt$(CHIPSET)sta --DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA --DAT_FILE_NAME = RT$(CHIPSET)STA.dat - - OBJ := $(MOD_NAME).o - -@@ -93,15 +91,10 @@ clean: - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d} - - install: -- rm -rf $(DAT_PATH) -- $(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless) -- mkdir $(DAT_PATH) -- cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/. -- install -d $(LINUX_SRC_MODULE) -- install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) -- /sbin/depmod -a ${shell uname -r} -+ mkdir -p $(INST_DIR) -+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR) - - uninstall: - # rm -rf $(DAT_PATH) -- rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME))) -- /sbin/depmod -a ${shell uname -r} -+ rm -rf $(addprefix $(INST_DIR),$(addsuffix .o,$(MOD_NAME))) -+ -diff -rupN DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.6 DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.6 ---- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.6 2009-03-25 03:43:06.000000000 -0400 -+++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.6 2009-04-20 21:22:45.000000000 -0400 -@@ -1,8 +1,6 @@ - include $(RT28xx_DIR)/os/linux/config.mk - - MOD_NAME = rt$(CHIPSET)sta --DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA --DAT_FILE_NAME = RT$(CHIPSET)STA.dat - - obj-m := $(MOD_NAME).o - -@@ -88,15 +86,10 @@ clean: +diff -rupN 2009_0918_RT2860_Linux_STA_v2.2.0.0.old/os/linux/Makefile.6 2009_0918_RT2860_Linux_STA_v2.2.0.0/os/linux/Makefile.6 +--- 2009_0918_RT2860_Linux_STA_v2.2.0.0.old/os/linux/Makefile.6 2009-09-13 23:50:36.000000000 -0400 ++++ 2009_0918_RT2860_Linux_STA_v2.2.0.0/os/linux/Makefile.6 2009-10-24 00:34:24.000000000 -0400 +@@ -105,15 +105,8 @@ clean: rm -f ../../sta/.*.{cmd,flags,d} install: @@ -57,8 +16,7 @@ + install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR) uninstall: - # rm -rf $(DAT_PATH) +-# rm -rf $(DAT_PATH) - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) - /sbin/depmod -a ${shell uname -r} + rm -rf $(addprefix $(INST_DIR),$(addsuffix .ko,$(MOD_NAME))) -+ Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-kmod.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- rt2860-kmod.spec 1 May 2010 10:09:58 -0000 1.74 +++ rt2860-kmod.spec 7 May 2010 07:17:02 -0000 1.75 @@ -3,24 +3,23 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest +#define buildforkernels newest Name: rt2860-kmod -Version: 2.1.2.0 -Release: 3%{?dist}.27 +Version: 2.3.0.0 +Release: 1%{?dist} Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 Group: System Environment/Kernel License: GPLv2+ -URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html -Source0: http://www.ralinktech.com.tw/data/drivers/2009_0521_RT2860_Linux_STA_V%{v... +URL: http://www.ralinktech.com/support.php?s=2 +# No direct downloads anymore. See the above link. +Source0: 2010_01_29_RT2860_Linux_STA_v2.3.0.0.tar.bz2 Source11: rt2860-kmodtool-excludekernel-filterfile Patch1: rt2860-dat-install-fixes.patch Patch2: rt2860-add-network-mgr-support.diff -Patch3: rt2860-remove-tftpboot-copy.patch Patch4: rt2860-no2.4-in-kernelversion.patch -Patch5: rt2860-2.6.31-compile.patch Patch6: rt2860-suppress-flood.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,7 +31,7 @@ %{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description -This package contains the Ralink Driver for WiFi, a linux device +This package contains the Ralink Driver for WiFi, a Linux device driver for 802.11a/b/g universal NIC cards - either PCI, PCIe or MiniPCI - that use Ralink chipsets (rt2760, rt2790, rt2860, rt2890). @@ -47,16 +46,10 @@ pushd *RT2860*Linux*STA* %patch1 -p1 -b .rpmbuild %patch2 -p1 -b .NetworkManager -%patch3 -p1 -b .tftpboot %patch4 -p1 -b .no24 -%patch5 -p1 -b .2.6.31 %patch6 -p1 -b .messageflood popd -# Fix weird permissions -find . -name "*.c" -exec chmod -x {} \; -find . -name "*.h" -exec chmod -x {} \; - for kernel_version in %{?kernel_versions} ; do cp -a *RT2860*Linux*STA* _kmod_build_${kernel_version%%___*} done @@ -79,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 07 2010 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.0-1 +- version update (2.3.0.0) + * Sat May 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.2.0-3.27 - rebuild for new kernel rt2860-no2.4-in-kernelversion.patch: Makefile | 20 -------------------- os/linux/config.mk | 15 --------------- 2 files changed, 35 deletions(-) Index: rt2860-no2.4-in-kernelversion.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-no2.4-in-kernelversion.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt2860-no2.4-in-kernelversion.patch 21 Apr 2009 03:11:31 -0000 1.2 +++ rt2860-no2.4-in-kernelversion.patch 7 May 2010 07:17:02 -0000 1.3 @@ -1,6 +1,86 @@ ---- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/config.mk 2009-04-20 21:30:17.000000000 -0400 -+++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/config.mk 2009-04-20 21:31:04.000000000 -0400 -@@ -235,14 +235,7 @@ export CFLAGS +diff -rupN 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/Makefile 2010_01_29_RT2860_Linux_STA_v2.3.0.0/Makefile +--- 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/Makefile 2009-12-23 01:15:08.000000000 -0500 ++++ 2010_01_29_RT2860_Linux_STA_v2.3.0.0/Makefile 2010-04-22 02:39:52.000000000 -0400 +@@ -176,13 +176,6 @@ test: + $(MAKE) -C tools test + + LINUX: +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- +- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +- +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot +-else + cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile + ifeq ($(PLATFORM),DM6446) + $(MAKE) ARCH=arm CROSS_COMPILE=arm_v5t_le- -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules +@@ -194,34 +187,21 @@ else + endif + endif + +-endif + + clean: + ifeq ($(TARGET), LINUX) +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- cp -f os/linux/Makefile.4 os/linux/Makefile +-else + cp -f os/linux/Makefile.6 os/linux/Makefile +-endif + $(MAKE) -C os/linux clean + rm -rf os/linux/Makefile + endif + + uninstall: + ifeq ($(TARGET), LINUX) +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall +-else + $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall + endif +-endif + + install: + ifeq ($(TARGET), LINUX) +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.4 install +-else + $(MAKE) -C $(RT28xx_DIR)/os/linux -f Makefile.6 install + endif +-endif + +diff -rupN 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/os/linux/config.mk 2010_01_29_RT2860_Linux_STA_v2.3.0.0/os/linux/config.mk +--- 2010_01_29_RT2860_Linux_STA_v2.3.0.0.old/os/linux/config.mk 2010-04-22 02:35:11.000000000 -0400 ++++ 2010_01_29_RT2860_Linux_STA_v2.3.0.0/os/linux/config.mk 2010-04-22 02:41:47.000000000 -0400 +@@ -218,14 +218,9 @@ WFLAGS += -DRT_BIG_ENDIAN -DINF_TWINPASS + endif + + ifeq ($(PLATFORM),INF_DANUBE) +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +-# Linux 2.4 +-WFLAGS += -DINF_DANUBE -DRT_BIG_ENDIAN +-else + # Linux 2.6 + WFLAGS += -DRT_BIG_ENDIAN + endif +-endif + + ifeq ($(PLATFORM),INF_AR9) + WFLAGS += -DRT_BIG_ENDIAN -DINF_AR9 +@@ -313,11 +308,7 @@ export CFLAGS + endif + + ifeq ($(PLATFORM),INF_DANUBE) +- ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- CFLAGS := -I$(RT28xx_DIR)/include $(WFLAGS) -Wundef -fno-strict-aliasing -fno-common -ffreestanding -Os -fomit-frame-pointer -G 0 -mno-abicalls -fno-pic -pipe -msoft-float -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -I$(LINUX_SRC)/include/asm-mips/mach-generic +- else + CFLAGS := -I$(RT28xx_DIR)/include $(WFLAGS) -Wundef -fno-strict-aliasing -fno-common -ffreestanding -Os -fomit-frame-pointer -G 0 -mno-abicalls -fno-pic -pipe -msoft-float -mabi=32 -march=mips32r2 -Wa,-32 -Wa,-march=mips32r2 -Wa,-mips32r2 -Wa,--trap -I$(LINUX_SRC)/include/asm-mips/mach-generic +- endif + export CFLAGS + endif + +@@ -342,14 +333,8 @@ export CFLAGS endif ifeq ($(PLATFORM),PC) @@ -9,8 +89,8 @@ - CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS) - export CFLAGS - else -- # Linux 2.6 - EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include + # Linux 2.6 + EXTRA_CFLAGS := $(WFLAGS) -DMODVERSIONS -I$(RT28xx_DIR)/include - endif endif Index: sources =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/F-12/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 May 2009 16:30:17 -0000 1.6 +++ sources 7 May 2010 07:17:02 -0000 1.7 @@ -1 +1 @@ -af45f9d642ae73d2062b86fa3a6934fb 2009_0521_RT2860_Linux_STA_V2.1.2.0.tgz +f97d72097ef12b3a4978444d0c4741e2 2010_01_29_RT2860_Linux_STA_v2.3.0.0.tar.bz2 --- rt2860-2.6.31-compile.patch DELETED --- --- rt2860-remove-tftpboot-copy.patch DELETED ---