July 2010 - rpmfusion-commits

rpms/rt2870/devel .cvsignore, 1.6, 1.7 rt2870.spec, 1.9, 1.10 sources, 1.6, 1.7

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt2870/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22606 Modified Files: .cvsignore rt2870.spec sources Log Message: * Sat Jul 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-1 - Update to 2.4.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt2870/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Jul 2010 18:03:24 -0000 1.6 +++ .cvsignore 11 Jul 2010 04:44:13 -0000 1.7 @@ -1 +1 @@ -2010_06_25_RT2870_Linux_STA_v2.4.0.0.tgz +2010_0709_RT2870_Linux_STA_v2.4.0.1.tar.bz2 Index: rt2870.spec =================================================================== RCS file: /cvs/free/rpms/rt2870/devel/rt2870.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rt2870.spec 4 Jul 2010 18:03:24 -0000 1.9 +++ rt2870.spec 11 Jul 2010 04:44:13 -0000 1.10 @@ -1,14 +1,14 @@ -%define SourceName 2010_06_25_RT2870_Linux_STA_v2.4.0.0 +%define SourceName 2010_0709_RT2870_Linux_STA_v2.4.0.1 Name: rt2870 -Version: 2.4.0.0 +Version: 2.4.0.1 Release: 1%{?dist} Summary: Common files for RaLink rt2870 kernel driver Group: System Environment/Kernel License: GPLv2+ URL: http://www.ralinktech.com/support.php?s=2 # No direct links anymore. The sources are downloaded from the above page. -Source0: %{SourceName}.tgz +Source0: %{SourceName}.tar.bz2 Source1: ReleaseNote-RT2870.txt Source2: suspend.sh # Blacklist the module shipped with kernel @@ -76,6 +76,9 @@ %endif %changelog +* Sat Jul 10 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.1-1 +- Update to 2.4.0.1 + * Sat Jun 26 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.4.0.0-1 - Update to 2.4.0.0 Index: sources =================================================================== RCS file: /cvs/free/rpms/rt2870/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Jul 2010 18:03:24 -0000 1.6 +++ sources 11 Jul 2010 04:44:13 -0000 1.7 @@ -1 +1 @@ -9ab5d68566eb6defd5a794bb98bcf425 2010_06_25_RT2870_Linux_STA_v2.4.0.0.tgz +9afbb7c60bcf17a5e8bfad89a4b14e0f 2010_0709_RT2870_Linux_STA_v2.4.0.1.tar.bz2

14 years, 5 months

1
0
0 / 0

rpms/rt3070-kmod/F-13 rt3070-2.6.34.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rt3070-Makefile.x-fixes.patch, 1.2, 1.3 rt3070-kmod.spec, 1.32, 1.33 rt3070-no2.4-in-kernelversion.patch, 1.1, 1.2 rt3070-strip-tftpboot-copy.patch, 1.2, 1.3 rt3070-suppress-flood.patch, 1.1, 1.2 sources, 1.4, 1.5 rt3070-2.6.31-compile.patch, 1.1, NONE rt3070-NetworkManager-support.patch, 1.2, NONE

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070-kmod/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv20586 Modified Files: .cvsignore rt3070-Makefile.x-fixes.patch rt3070-kmod.spec rt3070-no2.4-in-kernelversion.patch rt3070-strip-tftpboot-copy.patch rt3070-suppress-flood.patch sources Added Files: rt3070-2.6.34.patch Removed Files: rt3070-2.6.31-compile.patch rt3070-NetworkManager-support.patch Log Message: * Sun Jul 11 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 rt3070-2.6.34.patch: rt_linux.h | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE rt3070-2.6.34.patch --- diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/include/os/rt_linux.h DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/include/os/rt_linux.h --- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/include/os/rt_linux.h 2009-12-28 07:56:13.000000000 -0500 +++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/include/os/rt_linux.h 2010-07-10 23:42:56.000000000 -0400 @@ -1011,8 +1011,13 @@ typedef struct usb_device_id USB_DEVICE_ #define RT28XX_PUT_DEVICE usb_put_dev #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#else #define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) #define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#endif #else #define RT28XX_PUT_DEVICE rausb_put_dev Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-13/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Aug 2009 04:57:22 -0000 1.4 +++ .cvsignore 11 Jul 2010 04:16:22 -0000 1.5 @@ -1 +1 @@ -2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 rt3070-Makefile.x-fixes.patch: Makefile.4 | 9 ++------- Makefile.6 | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) Index: rt3070-Makefile.x-fixes.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-13/rt3070-Makefile.x-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt3070-Makefile.x-fixes.patch 23 May 2009 05:18:50 -0000 1.2 +++ rt3070-Makefile.x-fixes.patch 11 Jul 2010 04:16:23 -0000 1.3 @@ -1,8 +1,8 @@ -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4 ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009-03-01 21:54:15.000000000 -0500 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4 2009-03-25 20:37:41.000000000 -0400 -@@ -94,13 +94,15 @@ clean: - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d} +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.4 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.4 +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.4 2009-12-29 20:12:06.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.4 2010-06-27 14:46:15.000000000 -0400 +@@ -194,13 +194,8 @@ endif + endif install: - rm -rf $(DAT_PATH) @@ -12,23 +12,16 @@ - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} -+# 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) -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6 ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009-03-01 21:54:24.000000000 -0500 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6 2009-03-25 20:38:49.000000000 -0400 -@@ -89,13 +89,15 @@ clean: - rm -f ../../sta/.*.{cmd,flags,d} +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.6 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.6 +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.6 2009-12-29 20:12:13.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.6 2010-06-27 14:46:45.000000000 -0400 +@@ -192,13 +192,8 @@ endif + endif install: - rm -rf $(DAT_PATH) @@ -38,13 +31,6 @@ - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} -+# 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 .ko,$(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) Index: rt3070-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-13/rt3070-kmod.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- rt3070-kmod.spec 7 Jul 2010 14:16:26 -0000 1.32 +++ rt3070-kmod.spec 11 Jul 2010 04:16:23 -0000 1.33 @@ -3,26 +3,24 @@ # "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: rt3070-kmod -Version: 2.1.1.0 -Release: 3%{?dist}.16 +Version: 2.3.0.2 +Release: 1%{?dist} Summary: Kernel module for wireless devices with Ralink's rt307x chipsets 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_0525_RT3070_Linux_STA_v%{v... +URL: http://www.ralinktech.com/support.php?s=2 +# No more direct link. The file is downloaded from the above page. +Source0: DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 Source11: rt3070-kmodtool-excludekernel-filterfile - +Patch0: rt3070-2.6.34.patch Patch1: rt3070-no2.4-in-kernelversion.patch Patch2: rt3070-Makefile.x-fixes.patch -Patch3: rt3070-NetworkManager-support.patch Patch4: rt3070-strip-tftpboot-copy.patch -Patch5: rt3070-2.6.31-compile.patch Patch6: rt3070-suppress-flood.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -45,13 +43,11 @@ %setup -q -c -T -a 0 pushd *RT3070*Linux*STA* +%patch0 -p1 -b .2.6.34 %patch1 -p1 -b .no24 %patch2 -p1 -b .rpmbuild -%patch3 -p1 -b .NetworkManager %patch4 -p1 -b .tftpboot -%patch5 -p1 -b .2.6.31 %patch6 -p1 -b .messageflood -popd # Fix permissions for ext in c h; do @@ -59,11 +55,12 @@ done # To avoid possible conflict with rt2870 driver: -for sta in */include/os/rt_linux.h */os/linux/Makefile.6 */README_STA* */RT2870STACard.dat ; do +for sta in common/rtmp_init.c include/rt_ate.h include/os/rt_linux.h README_STA* RT2870STACard.dat ; do sed 's|RT2870STA|RT3070STA|g' $sta > tmp.sta touch -r $sta tmp.sta mv tmp.sta $sta done +popd for kernel_version in %{?kernel_versions} ; do cp -a *RT3070*Linux*STA* _kmod_build_${kernel_version%%___*} @@ -87,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 11 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 +- Update to 2.3.0.2 + * Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-3.16 - rebuild for new kernel rt3070-no2.4-in-kernelversion.patch: Makefile | 66 ----------------------------------------------------- os/linux/config.mk | 15 ------------ 2 files changed, 81 deletions(-) Index: rt3070-no2.4-in-kernelversion.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-13/rt3070-no2.4-in-kernelversion.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt3070-no2.4-in-kernelversion.patch 23 May 2009 05:18:50 -0000 1.1 +++ rt3070-no2.4-in-kernelversion.patch 11 Jul 2010 04:16:23 -0000 1.2 @@ -1,23 +1,162 @@ -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10 00:47:50.000000000 -0400 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-26 01:57:12.000000000 -0400 -@@ -236,14 +236,14 @@ export CFLAGS +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile 2009-12-28 07:38:34.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile 2010-06-27 14:43:50.000000000 -0400 +@@ -226,47 +226,6 @@ THREADX: + $(MAKE) -C $(RT28xx_DIR)/os/Threadx -f $(RT28xx_DIR)/os/ThreadX/Makefile + + LINUX: +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- +-ifeq ($(OSABL),YES) +- cp -f os/linux/Makefile.4.util $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-endif +- +- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +- +-ifeq ($(OSABL),YES) +- cp -f os/linux/Makefile.4.netif $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-endif +- +-ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot +-endif +-ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net +-endif +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot +-endif +-else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot +-endif +-endif +-endif +-else +- + ifeq ($(OSABL),YES) + cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules +@@ -311,7 +270,6 @@ ifeq ($(OSABL),YES) + endif + endif + endif +-endif + + + release: +@@ -337,11 +295,7 @@ 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 +@@ -351,45 +305,25 @@ 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 + + libwapi: +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- cp -f os/linux/Makefile.libwapi.4 $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-else + cp -f os/linux/Makefile.libwapi.6 $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules +-endif + + osabl: + ifeq ($(OSABL),YES) +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- cp -f os/linux/Makefile.4.util $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +- cp -f os/linux/Makefile.4.netif $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-else + cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules + cp -f os/linux/Makefile.6.netif $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules + endif +-endif + + # Declare the contents of the .PHONY variable as phony. We keep that information in a variable + .PHONY: $(PHONY) +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/config.mk DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/config.mk +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/config.mk 2010-02-08 01:28:14.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/config.mk 2010-06-27 14:39:09.000000000 -0400 +@@ -335,14 +335,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 +@@ -430,11 +425,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 + +@@ -459,14 +450,8 @@ export CFLAGS endif ifeq ($(PLATFORM),PC) - ifneq (,$(findstring 2.4,$(LINUX_SRC))) -+ # ifneq (,$(findstring 2.4,$(LINUX_SRC))) - # Linux 2.4 +- # Linux 2.4 - 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 -+ # 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 - endif -+ # endif endif - ifeq ($(PLATFORM),IXP) + #If the kernel version of RMI is newer than 2.6.27, please change "CFLAGS" to "EXTRA_FLAGS" rt3070-strip-tftpboot-copy.patch: Makefile | 25 ------------------------- 1 file changed, 25 deletions(-) Index: rt3070-strip-tftpboot-copy.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-13/rt3070-strip-tftpboot-copy.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt3070-strip-tftpboot-copy.patch 23 May 2009 05:18:50 -0000 1.2 +++ rt3070-strip-tftpboot-copy.patch 11 Jul 2010 04:16:23 -0000 1.3 @@ -1,51 +1,35 @@ -diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile ---- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile 2009-05-20 21:58:28.000000000 -0400 -+++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile 2009-05-22 17:30:47.000000000 -0400 -@@ -146,47 +146,28 @@ UCOS: - - - 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 - make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot --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 - ifeq ($(TARGET), UCOS) - make -C os/ucos clean MODE=$(RT28xx_MODE) +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile 2010-06-27 14:45:10.000000000 -0400 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile 2010-06-27 14:52:28.000000000 -0400 +@@ -247,31 +247,6 @@ ifeq ($(OSABL),YES) + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules 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 +-ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot +-endif +- rm -f os/linux/rt$(CHIPSET)ap.ko.lzma +- /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot -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 +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot -endif - - libwapi: - make -C $(RT28xx_DIR)/os/linux -f Makefile.libwapi +-endif +-endif +- +- + release: + ifeq ($(TARGET), LINUX) + $(MAKE) -C $(RT28xx_DIR)/striptool -f Makefile.release clean rt3070-suppress-flood.patch: common/cmm_asic.c | 4 ++-- os/linux/rt_ate.c | 4 ++-- os/linux/sta_ioctl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) Index: rt3070-suppress-flood.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-13/rt3070-suppress-flood.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt3070-suppress-flood.patch 22 Aug 2009 19:42:32 -0000 1.1 +++ rt3070-suppress-flood.patch 11 Jul 2010 04:16:23 -0000 1.2 @@ -1,7 +1,7 @@ -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25 03:20:30.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000 -0400 -@@ -609,7 +609,7 @@ VOID AsicSwitchChannel( +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/common/cmm_asic.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/common/cmm_asic.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/common/cmm_asic.c 2009-12-28 07:49:51.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/common/cmm_asic.c 2010-06-27 14:55:13.000000000 -0400 +@@ -1162,7 +1162,7 @@ VOID AsicSwitchChannel( TxPwer = (7+TxPwer); TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer); R3 |= (TxPwer << 10); @@ -10,7 +10,7 @@ } else { -@@ -623,7 +623,7 @@ VOID AsicSwitchChannel( +@@ -1176,7 +1176,7 @@ VOID AsicSwitchChannel( TxPwer2 = (7+TxPwer2); TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2); R4 |= (TxPwer2 << 7); @@ -19,10 +19,10 @@ } else { -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25 04:06:34.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000 -0400 -@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel( +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/rt_ate.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/rt_ate.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/rt_ate.c 2009-12-28 20:50:21.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/rt_ate.c 2010-06-27 14:56:09.000000000 -0400 +@@ -4489,7 +4489,7 @@ VOID ATEAsicSwitchChannel( TxPwer = (7+TxPwer); TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer); R3 |= (TxPwer << 10); @@ -31,7 +31,7 @@ } else { -@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel( +@@ -4503,7 +4503,7 @@ VOID ATEAsicSwitchChannel( TxPwer2 = (7+TxPwer2); TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2); R4 |= (TxPwer2 << 7); @@ -40,15 +40,15 @@ } else { -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23 06:07:18.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22 12:22:44.000000000 -0400 -@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device * +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/sta_ioctl.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/sta_ioctl.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/sta_ioctl.c 2010-02-07 21:20:09.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/sta_ioctl.c 2010-06-27 14:57:29.000000000 -0400 +@@ -1105,7 +1105,7 @@ int rt_ioctl_giwscan(struct net_device * data->length = current_ev - extra; - pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE; -- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length)); -+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length)); + pAd->StaCfg.bScanReqIsFromWebUI = FALSE; +- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAd->ScanTab.BssNr, data->length)); ++ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAd->ScanTab.BssNr, data->length)); return 0; } #endif Index: sources =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-13/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2009 04:57:22 -0000 1.4 +++ sources 11 Jul 2010 04:16:23 -0000 1.5 @@ -1 +1 @@ -b31ab4d77b6836853e293355915cfcad 2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +18a32c99fd0cd64c3aa9736a90c90795 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 --- rt3070-2.6.31-compile.patch DELETED --- --- rt3070-NetworkManager-support.patch DELETED ---

14 years, 5 months

1
0
0 / 0

rpms/rt3070-kmod/F-12 rt3070-kmod.spec,1.48,1.49

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv20033 Modified Files: rt3070-kmod.spec Log Message: rpmbuild doesn't like changelog dates in descending order. so change date to today's date Index: rt3070-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/rt3070-kmod.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- rt3070-kmod.spec 11 Jul 2010 04:10:48 -0000 1.48 +++ rt3070-kmod.spec 11 Jul 2010 04:13:12 -0000 1.49 @@ -84,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 +* Sun Jul 11 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 * Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-3.29

14 years, 5 months

1
0
0 / 0

rpms/rt3070-kmod/F-12 rt3070-kmod.spec,1.47,1.48

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19933 Modified Files: rt3070-kmod.spec Log Message: re-add changelog entry I erased accidentally Index: rt3070-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/rt3070-kmod.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- rt3070-kmod.spec 11 Jul 2010 04:04:53 -0000 1.47 +++ rt3070-kmod.spec 11 Jul 2010 04:10:48 -0000 1.48 @@ -87,6 +87,9 @@ * Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 +* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-3.29 +- rebuild for new kernel + * Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-3.28 - rebuild for new kernel

14 years, 5 months

1
0
0 / 0

rpms/rt3070-kmod/F-12 rt3070-2.6.34.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rt3070-Makefile.x-fixes.patch, 1.2, 1.3 rt3070-kmod.spec, 1.46, 1.47 rt3070-no2.4-in-kernelversion.patch, 1.1, 1.2 rt3070-strip-tftpboot-copy.patch, 1.2, 1.3 rt3070-suppress-flood.patch, 1.1, 1.2 sources, 1.4, 1.5 rt3070-2.6.31-compile.patch, 1.1, NONE rt3070-NetworkManager-support.patch, 1.2, NONE

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19143 Modified Files: .cvsignore rt3070-Makefile.x-fixes.patch rt3070-kmod.spec rt3070-no2.4-in-kernelversion.patch rt3070-strip-tftpboot-copy.patch rt3070-suppress-flood.patch sources Added Files: rt3070-2.6.34.patch Removed Files: rt3070-2.6.31-compile.patch rt3070-NetworkManager-support.patch Log Message: * Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 rt3070-2.6.34.patch: rt_linux.h | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE rt3070-2.6.34.patch --- diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/include/os/rt_linux.h DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/include/os/rt_linux.h --- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/include/os/rt_linux.h 2009-12-28 07:56:13.000000000 -0500 +++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/include/os/rt_linux.h 2010-07-10 23:42:56.000000000 -0400 @@ -1011,8 +1011,13 @@ typedef struct usb_device_id USB_DEVICE_ #define RT28XX_PUT_DEVICE usb_put_dev #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#else #define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) #define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#endif #else #define RT28XX_PUT_DEVICE rausb_put_dev Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Aug 2009 04:57:22 -0000 1.4 +++ .cvsignore 11 Jul 2010 04:04:53 -0000 1.5 @@ -1 +1 @@ -2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 rt3070-Makefile.x-fixes.patch: Makefile.4 | 9 ++------- Makefile.6 | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) Index: rt3070-Makefile.x-fixes.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/rt3070-Makefile.x-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt3070-Makefile.x-fixes.patch 23 May 2009 05:18:50 -0000 1.2 +++ rt3070-Makefile.x-fixes.patch 11 Jul 2010 04:04:53 -0000 1.3 @@ -1,8 +1,8 @@ -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4 ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009-03-01 21:54:15.000000000 -0500 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4 2009-03-25 20:37:41.000000000 -0400 -@@ -94,13 +94,15 @@ clean: - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d} +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.4 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.4 +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.4 2009-12-29 20:12:06.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.4 2010-06-27 14:46:15.000000000 -0400 +@@ -194,13 +194,8 @@ endif + endif install: - rm -rf $(DAT_PATH) @@ -12,23 +12,16 @@ - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} -+# 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) -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6 ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009-03-01 21:54:24.000000000 -0500 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6 2009-03-25 20:38:49.000000000 -0400 -@@ -89,13 +89,15 @@ clean: - rm -f ../../sta/.*.{cmd,flags,d} +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.6 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.6 +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.6 2009-12-29 20:12:13.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.6 2010-06-27 14:46:45.000000000 -0400 +@@ -192,13 +192,8 @@ endif + endif install: - rm -rf $(DAT_PATH) @@ -38,13 +31,6 @@ - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} -+# 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 .ko,$(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) Index: rt3070-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/rt3070-kmod.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- rt3070-kmod.spec 7 Jul 2010 14:25:47 -0000 1.46 +++ rt3070-kmod.spec 11 Jul 2010 04:04:53 -0000 1.47 @@ -3,26 +3,24 @@ # "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: rt3070-kmod -Version: 2.1.1.0 -Release: 3%{?dist}.29 +Version: 2.3.0.2 +Release: 1%{?dist} Summary: Kernel module for wireless devices with Ralink's rt307x chipsets 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_0525_RT3070_Linux_STA_v%{v... +URL: http://www.ralinktech.com/support.php?s=2 +# No more direct link. The file is downloaded from the above page. +Source0: DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 Source11: rt3070-kmodtool-excludekernel-filterfile - +Patch0: rt3070-2.6.34.patch Patch1: rt3070-no2.4-in-kernelversion.patch Patch2: rt3070-Makefile.x-fixes.patch -Patch3: rt3070-NetworkManager-support.patch Patch4: rt3070-strip-tftpboot-copy.patch -Patch5: rt3070-2.6.31-compile.patch Patch6: rt3070-suppress-flood.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -45,13 +43,11 @@ %setup -q -c -T -a 0 pushd *RT3070*Linux*STA* +%patch0 -p1 -b .2.6.34 %patch1 -p1 -b .no24 %patch2 -p1 -b .rpmbuild -%patch3 -p1 -b .NetworkManager %patch4 -p1 -b .tftpboot -%patch5 -p1 -b .2.6.31 %patch6 -p1 -b .messageflood -popd # Fix permissions for ext in c h; do @@ -59,11 +55,12 @@ done # To avoid possible conflict with rt2870 driver: -for sta in */include/os/rt_linux.h */os/linux/Makefile.6 */README_STA* */RT2870STACard.dat ; do +for sta in common/rtmp_init.c include/rt_ate.h include/os/rt_linux.h README_STA* RT2870STACard.dat ; do sed 's|RT2870STA|RT3070STA|g' $sta > tmp.sta touch -r $sta tmp.sta mv tmp.sta $sta done +popd for kernel_version in %{?kernel_versions} ; do cp -a *RT3070*Linux*STA* _kmod_build_${kernel_version%%___*} @@ -87,8 +84,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-3.29 -- rebuild for new kernel +* Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 +- Update to 2.3.0.2 * Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-3.28 - rebuild for new kernel rt3070-no2.4-in-kernelversion.patch: Makefile | 66 ----------------------------------------------------- os/linux/config.mk | 15 ------------ 2 files changed, 81 deletions(-) Index: rt3070-no2.4-in-kernelversion.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/rt3070-no2.4-in-kernelversion.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt3070-no2.4-in-kernelversion.patch 23 May 2009 05:18:50 -0000 1.1 +++ rt3070-no2.4-in-kernelversion.patch 11 Jul 2010 04:04:53 -0000 1.2 @@ -1,23 +1,162 @@ -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10 00:47:50.000000000 -0400 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-26 01:57:12.000000000 -0400 -@@ -236,14 +236,14 @@ export CFLAGS +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile 2009-12-28 07:38:34.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile 2010-06-27 14:43:50.000000000 -0400 +@@ -226,47 +226,6 @@ THREADX: + $(MAKE) -C $(RT28xx_DIR)/os/Threadx -f $(RT28xx_DIR)/os/ThreadX/Makefile + + LINUX: +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- +-ifeq ($(OSABL),YES) +- cp -f os/linux/Makefile.4.util $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-endif +- +- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +- +-ifeq ($(OSABL),YES) +- cp -f os/linux/Makefile.4.netif $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-endif +- +-ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot +-endif +-ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net +-endif +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot +-endif +-else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot +-endif +-endif +-endif +-else +- + ifeq ($(OSABL),YES) + cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules +@@ -311,7 +270,6 @@ ifeq ($(OSABL),YES) + endif + endif + endif +-endif + + + release: +@@ -337,11 +295,7 @@ 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 +@@ -351,45 +305,25 @@ 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 + + libwapi: +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- cp -f os/linux/Makefile.libwapi.4 $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-else + cp -f os/linux/Makefile.libwapi.6 $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules +-endif + + osabl: + ifeq ($(OSABL),YES) +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- cp -f os/linux/Makefile.4.util $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +- cp -f os/linux/Makefile.4.netif $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-else + cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules + cp -f os/linux/Makefile.6.netif $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules + endif +-endif + + # Declare the contents of the .PHONY variable as phony. We keep that information in a variable + .PHONY: $(PHONY) +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/config.mk DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/config.mk +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/config.mk 2010-02-08 01:28:14.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/config.mk 2010-06-27 14:39:09.000000000 -0400 +@@ -335,14 +335,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 +@@ -430,11 +425,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 + +@@ -459,14 +450,8 @@ export CFLAGS endif ifeq ($(PLATFORM),PC) - ifneq (,$(findstring 2.4,$(LINUX_SRC))) -+ # ifneq (,$(findstring 2.4,$(LINUX_SRC))) - # Linux 2.4 +- # Linux 2.4 - 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 -+ # 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 - endif -+ # endif endif - ifeq ($(PLATFORM),IXP) + #If the kernel version of RMI is newer than 2.6.27, please change "CFLAGS" to "EXTRA_FLAGS" rt3070-strip-tftpboot-copy.patch: Makefile | 25 ------------------------- 1 file changed, 25 deletions(-) Index: rt3070-strip-tftpboot-copy.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/rt3070-strip-tftpboot-copy.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt3070-strip-tftpboot-copy.patch 23 May 2009 05:18:50 -0000 1.2 +++ rt3070-strip-tftpboot-copy.patch 11 Jul 2010 04:04:53 -0000 1.3 @@ -1,51 +1,35 @@ -diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile ---- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile 2009-05-20 21:58:28.000000000 -0400 -+++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile 2009-05-22 17:30:47.000000000 -0400 -@@ -146,47 +146,28 @@ UCOS: - - - 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 - make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot --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 - ifeq ($(TARGET), UCOS) - make -C os/ucos clean MODE=$(RT28xx_MODE) +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile 2010-06-27 14:45:10.000000000 -0400 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile 2010-06-27 14:52:28.000000000 -0400 +@@ -247,31 +247,6 @@ ifeq ($(OSABL),YES) + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules 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 +-ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot +-endif +- rm -f os/linux/rt$(CHIPSET)ap.ko.lzma +- /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot -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 +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot -endif - - libwapi: - make -C $(RT28xx_DIR)/os/linux -f Makefile.libwapi +-endif +-endif +- +- + release: + ifeq ($(TARGET), LINUX) + $(MAKE) -C $(RT28xx_DIR)/striptool -f Makefile.release clean rt3070-suppress-flood.patch: common/cmm_asic.c | 4 ++-- os/linux/rt_ate.c | 4 ++-- os/linux/sta_ioctl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) Index: rt3070-suppress-flood.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/rt3070-suppress-flood.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt3070-suppress-flood.patch 22 Aug 2009 19:42:32 -0000 1.1 +++ rt3070-suppress-flood.patch 11 Jul 2010 04:04:53 -0000 1.2 @@ -1,7 +1,7 @@ -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25 03:20:30.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000 -0400 -@@ -609,7 +609,7 @@ VOID AsicSwitchChannel( +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/common/cmm_asic.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/common/cmm_asic.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/common/cmm_asic.c 2009-12-28 07:49:51.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/common/cmm_asic.c 2010-06-27 14:55:13.000000000 -0400 +@@ -1162,7 +1162,7 @@ VOID AsicSwitchChannel( TxPwer = (7+TxPwer); TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer); R3 |= (TxPwer << 10); @@ -10,7 +10,7 @@ } else { -@@ -623,7 +623,7 @@ VOID AsicSwitchChannel( +@@ -1176,7 +1176,7 @@ VOID AsicSwitchChannel( TxPwer2 = (7+TxPwer2); TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2); R4 |= (TxPwer2 << 7); @@ -19,10 +19,10 @@ } else { -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25 04:06:34.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000 -0400 -@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel( +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/rt_ate.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/rt_ate.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/rt_ate.c 2009-12-28 20:50:21.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/rt_ate.c 2010-06-27 14:56:09.000000000 -0400 +@@ -4489,7 +4489,7 @@ VOID ATEAsicSwitchChannel( TxPwer = (7+TxPwer); TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer); R3 |= (TxPwer << 10); @@ -31,7 +31,7 @@ } else { -@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel( +@@ -4503,7 +4503,7 @@ VOID ATEAsicSwitchChannel( TxPwer2 = (7+TxPwer2); TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2); R4 |= (TxPwer2 << 7); @@ -40,15 +40,15 @@ } else { -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23 06:07:18.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22 12:22:44.000000000 -0400 -@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device * +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/sta_ioctl.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/sta_ioctl.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/sta_ioctl.c 2010-02-07 21:20:09.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/sta_ioctl.c 2010-06-27 14:57:29.000000000 -0400 +@@ -1105,7 +1105,7 @@ int rt_ioctl_giwscan(struct net_device * data->length = current_ev - extra; - pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE; -- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length)); -+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length)); + pAd->StaCfg.bScanReqIsFromWebUI = FALSE; +- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAd->ScanTab.BssNr, data->length)); ++ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAd->ScanTab.BssNr, data->length)); return 0; } #endif Index: sources =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/F-12/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2009 04:57:22 -0000 1.4 +++ sources 11 Jul 2010 04:04:53 -0000 1.5 @@ -1 +1 @@ -b31ab4d77b6836853e293355915cfcad 2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +18a32c99fd0cd64c3aa9736a90c90795 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 --- rt3070-2.6.31-compile.patch DELETED --- --- rt3070-NetworkManager-support.patch DELETED ---

14 years, 5 months

1
0
0 / 0

rpms/rt3070-kmod/devel rt3070-2.6.34.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rt3070-Makefile.x-fixes.patch, 1.2, 1.3 rt3070-kmod.spec, 1.23, 1.24 rt3070-no2.4-in-kernelversion.patch, 1.1, 1.2 rt3070-strip-tftpboot-copy.patch, 1.2, 1.3 rt3070-suppress-flood.patch, 1.1, 1.2 sources, 1.4, 1.5 rt3070-2.6.31-compile.patch, 1.1, NONE rt3070-NetworkManager-support.patch, 1.2, NONE

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18087 Modified Files: .cvsignore rt3070-Makefile.x-fixes.patch rt3070-kmod.spec rt3070-no2.4-in-kernelversion.patch rt3070-strip-tftpboot-copy.patch rt3070-suppress-flood.patch sources Added Files: rt3070-2.6.34.patch Removed Files: rt3070-2.6.31-compile.patch rt3070-NetworkManager-support.patch Log Message: * Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 rt3070-2.6.34.patch: rt_linux.h | 5 +++++ 1 file changed, 5 insertions(+) --- NEW FILE rt3070-2.6.34.patch --- diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/include/os/rt_linux.h DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/include/os/rt_linux.h --- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/include/os/rt_linux.h 2009-12-28 07:56:13.000000000 -0500 +++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/include/os/rt_linux.h 2010-07-10 23:42:56.000000000 -0400 @@ -1011,8 +1011,13 @@ typedef struct usb_device_id USB_DEVICE_ #define RT28XX_PUT_DEVICE usb_put_dev #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC) #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#else #define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr) #define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) +#endif #else #define RT28XX_PUT_DEVICE rausb_put_dev Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Aug 2009 04:57:22 -0000 1.4 +++ .cvsignore 11 Jul 2010 03:52:52 -0000 1.5 @@ -1 +1 @@ -2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 rt3070-Makefile.x-fixes.patch: Makefile.4 | 9 ++------- Makefile.6 | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) Index: rt3070-Makefile.x-fixes.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-Makefile.x-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt3070-Makefile.x-fixes.patch 23 May 2009 05:18:50 -0000 1.2 +++ rt3070-Makefile.x-fixes.patch 11 Jul 2010 03:52:52 -0000 1.3 @@ -1,8 +1,8 @@ -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4 ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009-03-01 21:54:15.000000000 -0500 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4 2009-03-25 20:37:41.000000000 -0400 -@@ -94,13 +94,15 @@ clean: - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d} +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.4 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.4 +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.4 2009-12-29 20:12:06.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.4 2010-06-27 14:46:15.000000000 -0400 +@@ -194,13 +194,8 @@ endif + endif install: - rm -rf $(DAT_PATH) @@ -12,23 +12,16 @@ - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} -+# 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) -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6 ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009-03-01 21:54:24.000000000 -0500 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6 2009-03-25 20:38:49.000000000 -0400 -@@ -89,13 +89,15 @@ clean: - rm -f ../../sta/.*.{cmd,flags,d} +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.6 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.6 +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/Makefile.6 2009-12-29 20:12:13.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/Makefile.6 2010-06-27 14:46:45.000000000 -0400 +@@ -192,13 +192,8 @@ endif + endif install: - rm -rf $(DAT_PATH) @@ -38,13 +31,6 @@ - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} -+# 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 .ko,$(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) Index: rt3070-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-kmod.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- rt3070-kmod.spec 22 Nov 2009 13:13:19 -0000 1.23 +++ rt3070-kmod.spec 11 Jul 2010 03:52:52 -0000 1.24 @@ -6,23 +6,21 @@ #define buildforkernels newest Name: rt3070-kmod -Version: 2.1.1.0 -Release: 3%{?dist}.7 +Version: 2.3.0.2 +Release: 1%{?dist} Summary: Kernel module for wireless devices with Ralink's rt307x chipsets 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_0525_RT3070_Linux_STA_v%{v... +URL: http://www.ralinktech.com/support.php?s=2 +# No more direct link. The file is downloaded from the above page. +Source0: DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 Source11: rt3070-kmodtool-excludekernel-filterfile - +Patch0: rt3070-2.6.34.patch Patch1: rt3070-no2.4-in-kernelversion.patch Patch2: rt3070-Makefile.x-fixes.patch -Patch3: rt3070-NetworkManager-support.patch Patch4: rt3070-strip-tftpboot-copy.patch -Patch5: rt3070-2.6.31-compile.patch Patch6: rt3070-suppress-flood.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -45,13 +43,11 @@ %setup -q -c -T -a 0 pushd *RT3070*Linux*STA* +%patch0 -p1 -b .2.6.34 %patch1 -p1 -b .no24 %patch2 -p1 -b .rpmbuild -%patch3 -p1 -b .NetworkManager %patch4 -p1 -b .tftpboot -%patch5 -p1 -b .2.6.31 %patch6 -p1 -b .messageflood -popd # Fix permissions for ext in c h; do @@ -59,11 +55,12 @@ done # To avoid possible conflict with rt2870 driver: -for sta in */include/os/rt_linux.h */os/linux/Makefile.6 */README_STA* */RT2870STACard.dat ; do +for sta in common/rtmp_init.c include/rt_ate.h include/os/rt_linux.h README_STA* RT2870STACard.dat ; do sed 's|RT2870STA|RT3070STA|g' $sta > tmp.sta touch -r $sta tmp.sta mv tmp.sta $sta done +popd for kernel_version in %{?kernel_versions} ; do cp -a *RT3070*Linux*STA* _kmod_build_${kernel_version%%___*} @@ -87,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 +- Update to 2.3.0.2 + * Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-3.7 - rebuild for new kernel, disable i586 builds rt3070-no2.4-in-kernelversion.patch: Makefile | 66 ----------------------------------------------------- os/linux/config.mk | 15 ------------ 2 files changed, 81 deletions(-) Index: rt3070-no2.4-in-kernelversion.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-no2.4-in-kernelversion.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt3070-no2.4-in-kernelversion.patch 23 May 2009 05:18:50 -0000 1.1 +++ rt3070-no2.4-in-kernelversion.patch 11 Jul 2010 03:52:52 -0000 1.2 @@ -1,23 +1,162 @@ -diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk ---- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009-03-10 00:47:50.000000000 -0400 -+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk 2009-03-26 01:57:12.000000000 -0400 -@@ -236,14 +236,14 @@ export CFLAGS +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile 2009-12-28 07:38:34.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile 2010-06-27 14:43:50.000000000 -0400 +@@ -226,47 +226,6 @@ THREADX: + $(MAKE) -C $(RT28xx_DIR)/os/Threadx -f $(RT28xx_DIR)/os/ThreadX/Makefile + + LINUX: +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- +-ifeq ($(OSABL),YES) +- cp -f os/linux/Makefile.4.util $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-endif +- +- cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +- +-ifeq ($(OSABL),YES) +- cp -f os/linux/Makefile.4.netif $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-endif +- +-ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot +-endif +-ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net +-endif +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot +-endif +-else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot +-endif +-endif +-endif +-else +- + ifeq ($(OSABL),YES) + cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules +@@ -311,7 +270,6 @@ ifeq ($(OSABL),YES) + endif + endif + endif +-endif + + + release: +@@ -337,11 +295,7 @@ 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 +@@ -351,45 +305,25 @@ 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 + + libwapi: +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- cp -f os/linux/Makefile.libwapi.4 $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-else + cp -f os/linux/Makefile.libwapi.6 $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules +-endif + + osabl: + ifeq ($(OSABL),YES) +-ifneq (,$(findstring 2.4,$(LINUX_SRC))) +- cp -f os/linux/Makefile.4.util $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +- cp -f os/linux/Makefile.4.netif $(RT28xx_DIR)/os/linux/Makefile +- $(MAKE) -C $(RT28xx_DIR)/os/linux/ +-else + cp -f os/linux/Makefile.6.util $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules + cp -f os/linux/Makefile.6.netif $(RT28xx_DIR)/os/linux/Makefile + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules + endif +-endif + + # Declare the contents of the .PHONY variable as phony. We keep that information in a variable + .PHONY: $(PHONY) +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/config.mk DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/config.mk +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/config.mk 2010-02-08 01:28:14.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/config.mk 2010-06-27 14:39:09.000000000 -0400 +@@ -335,14 +335,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 +@@ -430,11 +425,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 + +@@ -459,14 +450,8 @@ export CFLAGS endif ifeq ($(PLATFORM),PC) - ifneq (,$(findstring 2.4,$(LINUX_SRC))) -+ # ifneq (,$(findstring 2.4,$(LINUX_SRC))) - # Linux 2.4 +- # Linux 2.4 - 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 -+ # 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 - endif -+ # endif endif - ifeq ($(PLATFORM),IXP) + #If the kernel version of RMI is newer than 2.6.27, please change "CFLAGS" to "EXTRA_FLAGS" rt3070-strip-tftpboot-copy.patch: Makefile | 25 ------------------------- 1 file changed, 25 deletions(-) Index: rt3070-strip-tftpboot-copy.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-strip-tftpboot-copy.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt3070-strip-tftpboot-copy.patch 23 May 2009 05:18:50 -0000 1.2 +++ rt3070-strip-tftpboot-copy.patch 11 Jul 2010 03:52:52 -0000 1.3 @@ -1,51 +1,35 @@ -diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile ---- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile 2009-05-20 21:58:28.000000000 -0400 -+++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile 2009-05-22 17:30:47.000000000 -0400 -@@ -146,47 +146,28 @@ UCOS: - - - 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 - make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot --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 - ifeq ($(TARGET), UCOS) - make -C os/ucos clean MODE=$(RT28xx_MODE) +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/Makefile 2010-06-27 14:45:10.000000000 -0400 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/Makefile 2010-06-27 14:52:28.000000000 -0400 +@@ -247,31 +247,6 @@ ifeq ($(OSABL),YES) + $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules 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 +-ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot +-endif +- rm -f os/linux/rt$(CHIPSET)ap.ko.lzma +- /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot -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 +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot -endif - - libwapi: - make -C $(RT28xx_DIR)/os/linux -f Makefile.libwapi +-endif +-endif +- +- + release: + ifeq ($(TARGET), LINUX) + $(MAKE) -C $(RT28xx_DIR)/striptool -f Makefile.release clean rt3070-suppress-flood.patch: common/cmm_asic.c | 4 ++-- os/linux/rt_ate.c | 4 ++-- os/linux/sta_ioctl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) Index: rt3070-suppress-flood.patch =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-suppress-flood.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt3070-suppress-flood.patch 22 Aug 2009 19:42:32 -0000 1.1 +++ rt3070-suppress-flood.patch 11 Jul 2010 03:52:52 -0000 1.2 @@ -1,7 +1,7 @@ -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/common/cmm_asic.c 2009-03-25 03:20:30.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/common/cmm_asic.c 2009-08-22 12:24:53.000000000 -0400 -@@ -609,7 +609,7 @@ VOID AsicSwitchChannel( +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/common/cmm_asic.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/common/cmm_asic.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/common/cmm_asic.c 2009-12-28 07:49:51.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/common/cmm_asic.c 2010-06-27 14:55:13.000000000 -0400 +@@ -1162,7 +1162,7 @@ VOID AsicSwitchChannel( TxPwer = (7+TxPwer); TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer); R3 |= (TxPwer << 10); @@ -10,7 +10,7 @@ } else { -@@ -623,7 +623,7 @@ VOID AsicSwitchChannel( +@@ -1176,7 +1176,7 @@ VOID AsicSwitchChannel( TxPwer2 = (7+TxPwer2); TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2); R4 |= (TxPwer2 << 7); @@ -19,10 +19,10 @@ } else { -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/rt_ate.c 2009-03-25 04:06:34.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/rt_ate.c 2009-08-22 12:25:24.000000000 -0400 -@@ -4031,7 +4031,7 @@ VOID ATEAsicSwitchChannel( +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/rt_ate.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/rt_ate.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/rt_ate.c 2009-12-28 20:50:21.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/rt_ate.c 2010-06-27 14:56:09.000000000 -0400 +@@ -4489,7 +4489,7 @@ VOID ATEAsicSwitchChannel( TxPwer = (7+TxPwer); TxPwer = (TxPwer > 0xF) ? (0xF) : (TxPwer); R3 |= (TxPwer << 10); @@ -31,7 +31,7 @@ } else { -@@ -4045,7 +4045,7 @@ VOID ATEAsicSwitchChannel( +@@ -4503,7 +4503,7 @@ VOID ATEAsicSwitchChannel( TxPwer2 = (7+TxPwer2); TxPwer2 = (TxPwer2 > 0xF) ? (0xF) : (TxPwer2); R4 |= (TxPwer2 << 7); @@ -40,15 +40,15 @@ } else { -diff -rupN 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c ---- 2009_0521_RT2860_Linux_STA_V2.1.2.0.old/os/linux/sta_ioctl.c 2009-04-23 06:07:18.000000000 -0400 -+++ 2009_0521_RT2860_Linux_STA_V2.1.2.0/os/linux/sta_ioctl.c 2009-08-22 12:22:44.000000000 -0400 -@@ -1465,7 +1465,7 @@ int rt_ioctl_giwscan(struct net_device * +diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/sta_ioctl.c DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/sta_ioctl.c +--- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/os/linux/sta_ioctl.c 2010-02-07 21:20:09.000000000 -0500 ++++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/os/linux/sta_ioctl.c 2010-06-27 14:57:29.000000000 -0400 +@@ -1105,7 +1105,7 @@ int rt_ioctl_giwscan(struct net_device * data->length = current_ev - extra; - pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE; -- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length)); -+ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAdapter->ScanTab.BssNr, data->length)); + pAd->StaCfg.bScanReqIsFromWebUI = FALSE; +- DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAd->ScanTab.BssNr, data->length)); ++ // comment out as it causes flood in system messages. // DBGPRINT(RT_DEBUG_ERROR ,("===>rt_ioctl_giwscan. %d(%d) BSS returned, data->length = %d\n",i , pAd->ScanTab.BssNr, data->length)); return 0; } #endif Index: sources =================================================================== RCS file: /cvs/free/rpms/rt3070-kmod/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2009 04:57:22 -0000 1.4 +++ sources 11 Jul 2010 03:52:52 -0000 1.5 @@ -1 +1 @@ -b31ab4d77b6836853e293355915cfcad 2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +18a32c99fd0cd64c3aa9736a90c90795 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 --- rt3070-2.6.31-compile.patch DELETED --- --- rt3070-NetworkManager-support.patch DELETED ---

14 years, 5 months

1
0
0 / 0

rpms/rt3070/F-12 ReadMe.txt, NONE, 1.1 rt3070-allowTKIP.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rt3070.spec, 1.8, 1.9 sources, 1.4, 1.5 ReleaseNote-RT3070.txt, 1.2, NONE

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv15774 Modified Files: .cvsignore rt3070.spec sources Added Files: ReadMe.txt rt3070-allowTKIP.patch Removed Files: ReleaseNote-RT3070.txt Log Message: * Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 --- NEW FILE ReadMe.txt --- [2.3.0.1] 1. Fix Shared WEP security mode can't work on wpa_supplicant wext driver. 2. Fix Hidden SSID can't work on wpa_supplicant wext driver. 3. Fix AdHoc mode can't work on wpa_supplicant wext driver. [2.3.0.0] 1. Support PSP XLINK in ad-hoc mode. 2. Add mac80211 iw utility other commands support. 3. Fix issue: The start address of HeaderBuf must be aligned by 4 when VENDOR_FEATURE1_SUPPORT is enabled. 4. WMM ACM: see history of acm_comm.c. 5. Support WpaSupplicant(v0.6.9) WPS 6. Fix WPS issue: Check SelectRegistrar is TRUE or FALSE 7. Fix WPS issue: Some AP (ex. Buffalo WZR-AG300NH) would change SSID to another SSID after push WPS PBC button. After WPS process finish, change SSID to original SSID. Driver needs to wait AP to re-generate Beacon; otherwise, driver will update this PBC SSID to MlmeAux. 8. Shorten the waiting time when unplug the device. 9. Fix mgmt ring full issue: It happened only in big-endian platform and quickly switch the network type between Infra and Adhoc mode. 10. Fix statistics issue: It happened in big-endian platform, tx count would be zero. 11. Support WiFi Draft_3.0 11n test items. 12. Support Linux Kernel 2.6.31 13. Support Ad-hoc WPS2PSK/AES (DPO doesn't support this item) 14. Support Samsung Auto Provision (only for Samsung Project) 15. For GPL issue: Separate three kernel modules - util module, driver module, netif module. util module and netif module could license GPL. 16. Support CFG80211 of Linux Kernel 2.6.32 Driver module couldn't license GPL. rt3070-allowTKIP.patch: RT2870STA.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE rt3070-allowTKIP.patch --- diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/RT2870STA.dat DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/RT2870STA.dat --- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/RT2870STA.dat 2009-12-28 07:38:31.000000000 -0500 +++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/RT2870STA.dat 2010-07-10 22:31:56.000000000 -0400 @@ -47,7 +47,7 @@ HT_BAWinSize=64 HT_GI=1 HT_MCS=33 HT_MIMOPSMode=3 -HT_DisallowTKIP=1 +HT_DisallowTKIP=0 EthConvertMode= EthCloneMac= IEEE80211H=0 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt3070/F-12/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Aug 2009 04:47:43 -0000 1.4 +++ .cvsignore 11 Jul 2010 03:24:10 -0000 1.5 @@ -1 +1 @@ -2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 Index: rt3070.spec =================================================================== RCS file: /cvs/free/rpms/rt3070/F-12/rt3070.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rt3070.spec 4 Dec 2009 13:35:32 -0000 1.8 +++ rt3070.spec 11 Jul 2010 03:24:10 -0000 1.9 @@ -1,19 +1,22 @@ -%define SourceName 2009_0525_RT3070_Linux_STA_v2.1.1.0 +%define SourceName DPO_RT3070_LinuxSTA_V2.3.0.2_20100412 Name: rt3070 -Version: 2.1.1.0 -Release: 3%{?dist}.1 +Version: 2.3.0.2 +Release: 1%{?dist} Summary: Common files for RaLink rt3070 kernel driver Group: System Environment/Kernel License: GPLv2+ -URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html -Source0: http://www.ralinktech.com.tw/data/drivers/%{SourceName}.bz2 -Source1: http://www.ralinktech.com.tw/data/drivers/ReleaseNote-RT3070.txt +URL: http://www.ralinktech.com/support.php?s=2 +# No more direct link. The file is downloaded from the above page. +Source0: %{SourceName}.tar.bz2 +Source1: ReadMe.txt # Alternative suspend script. Might not be necessary anymore. # Kept for historical reasons. Source2: suspend.sh # Blacklist the module shipped with kernel Source3: blacklist-rt2800usb.conf +# Needed for WPA2 support (RFBZ #664) +Patch0: rt3070-allowTKIP.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,25 +30,28 @@ %prep %setup -q -n %{SourceName} +%patch0 -p1 -# Fix bunch of encoding issues cp -a %{SOURCE1} . -for file in ReleaseNote* sta_ate_iwpriv_usage.txt README_STA*; do +cp -a %{SOURCE2} . + +# Fix bunch of encoding issues + +for file in ReadMe.txt *iwpriv_usage.txt "LICENSE*.txt" README_STA*; do + chmod -x $file iconv -f JOHAB -t UTF8 $file -o $file.tmp sed 's/\r//' $file.tmp > $file.tmp2 mv -f $file.tmp2 $file done # To avoid possible conflict with rt2870 driver: -for sta in include/os/rt_linux.h os/linux/Makefile.6 README_STA* RT2870STACard.dat ; do +for sta in common/rtmp_init.c include/rt_ate.h include/os/rt_linux.h README_STA* RT2870STACard.dat ; do sed 's|RT2870STA|RT3070STA|g' $sta > tmp.sta touch -r $sta tmp.sta mv tmp.sta $sta done %build -# Needed for WPA2 support (RFBZ #664) -sed -i 's|HT_DisallowTKIP=1|HT_DisallowTKIP=0|' RT2870STA.dat sleep 1m %install @@ -53,24 +59,28 @@ install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/ install -pm 0644 RT2870STA.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/RT3070STA.dat install -pm 0644 RT2870STACard.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/RT3070STACard.dat - -cp -a %{SOURCE2} . - +%if 0%{fedora} < 14 install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ cp -a %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ +%endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README_STA_usb *.txt suspend.sh +%doc README_STA_usb *.txt suspend.sh LICENSE*.txt %dir %{_sysconfdir}/Wireless %dir %{_sysconfdir}/Wireless/RT3070STA %config(noreplace) %{_sysconfdir}/Wireless/RT3070STA/RT3070STA*.dat +%if 0%{fedora} < 14 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-rt2800usb.conf +%endif %changelog +* Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 +- Update to 2.3.0.2 + * Fri Dec 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3.1 - Blacklist kernel's rt2800usb module Index: sources =================================================================== RCS file: /cvs/free/rpms/rt3070/F-12/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2009 04:47:43 -0000 1.4 +++ sources 11 Jul 2010 03:24:10 -0000 1.5 @@ -1 +1 @@ -b31ab4d77b6836853e293355915cfcad 2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +18a32c99fd0cd64c3aa9736a90c90795 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 --- ReleaseNote-RT3070.txt DELETED ---

14 years, 5 months

1
0
0 / 0

rpms/rt3070/F-13 ReadMe.txt, NONE, 1.1 rt3070-allowTKIP.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rt3070.spec, 1.8, 1.9 sources, 1.4, 1.5 ReleaseNote-RT3070.txt, 1.2, NONE

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv15559 Modified Files: .cvsignore rt3070.spec sources Added Files: ReadMe.txt rt3070-allowTKIP.patch Removed Files: ReleaseNote-RT3070.txt Log Message: * Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 --- NEW FILE ReadMe.txt --- [2.3.0.1] 1. Fix Shared WEP security mode can't work on wpa_supplicant wext driver. 2. Fix Hidden SSID can't work on wpa_supplicant wext driver. 3. Fix AdHoc mode can't work on wpa_supplicant wext driver. [2.3.0.0] 1. Support PSP XLINK in ad-hoc mode. 2. Add mac80211 iw utility other commands support. 3. Fix issue: The start address of HeaderBuf must be aligned by 4 when VENDOR_FEATURE1_SUPPORT is enabled. 4. WMM ACM: see history of acm_comm.c. 5. Support WpaSupplicant(v0.6.9) WPS 6. Fix WPS issue: Check SelectRegistrar is TRUE or FALSE 7. Fix WPS issue: Some AP (ex. Buffalo WZR-AG300NH) would change SSID to another SSID after push WPS PBC button. After WPS process finish, change SSID to original SSID. Driver needs to wait AP to re-generate Beacon; otherwise, driver will update this PBC SSID to MlmeAux. 8. Shorten the waiting time when unplug the device. 9. Fix mgmt ring full issue: It happened only in big-endian platform and quickly switch the network type between Infra and Adhoc mode. 10. Fix statistics issue: It happened in big-endian platform, tx count would be zero. 11. Support WiFi Draft_3.0 11n test items. 12. Support Linux Kernel 2.6.31 13. Support Ad-hoc WPS2PSK/AES (DPO doesn't support this item) 14. Support Samsung Auto Provision (only for Samsung Project) 15. For GPL issue: Separate three kernel modules - util module, driver module, netif module. util module and netif module could license GPL. 16. Support CFG80211 of Linux Kernel 2.6.32 Driver module couldn't license GPL. rt3070-allowTKIP.patch: RT2870STA.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE rt3070-allowTKIP.patch --- diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/RT2870STA.dat DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/RT2870STA.dat --- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/RT2870STA.dat 2009-12-28 07:38:31.000000000 -0500 +++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/RT2870STA.dat 2010-07-10 22:31:56.000000000 -0400 @@ -47,7 +47,7 @@ HT_BAWinSize=64 HT_GI=1 HT_MCS=33 HT_MIMOPSMode=3 -HT_DisallowTKIP=1 +HT_DisallowTKIP=0 EthConvertMode= EthCloneMac= IEEE80211H=0 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt3070/F-13/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Aug 2009 04:47:43 -0000 1.4 +++ .cvsignore 11 Jul 2010 03:22:11 -0000 1.5 @@ -1 +1 @@ -2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 Index: rt3070.spec =================================================================== RCS file: /cvs/free/rpms/rt3070/F-13/rt3070.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rt3070.spec 31 May 2010 15:36:40 -0000 1.8 +++ rt3070.spec 11 Jul 2010 03:22:11 -0000 1.9 @@ -1,19 +1,22 @@ -%define SourceName 2009_0525_RT3070_Linux_STA_v2.1.1.0 +%define SourceName DPO_RT3070_LinuxSTA_V2.3.0.2_20100412 Name: rt3070 -Version: 2.1.1.0 -Release: 3%{?dist}.1 +Version: 2.3.0.2 +Release: 1%{?dist} Summary: Common files for RaLink rt3070 kernel driver Group: System Environment/Kernel License: GPLv2+ -URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html -Source0: http://www.ralinktech.com.tw/data/drivers/%{SourceName}.bz2 -Source1: http://www.ralinktech.com.tw/data/drivers/ReleaseNote-RT3070.txt +URL: http://www.ralinktech.com/support.php?s=2 +# No more direct link. The file is downloaded from the above page. +Source0: %{SourceName}.tar.bz2 +Source1: ReadMe.txt # Alternative suspend script. Might not be necessary anymore. # Kept for historical reasons. Source2: suspend.sh # Blacklist the module shipped with kernel Source3: blacklist-rt2800usb.conf +# Needed for WPA2 support (RFBZ #664) +Patch0: rt3070-allowTKIP.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,25 +30,28 @@ %prep %setup -q -n %{SourceName} +%patch0 -p1 -# Fix bunch of encoding issues cp -a %{SOURCE1} . -for file in ReleaseNote* sta_ate_iwpriv_usage.txt README_STA*; do +cp -a %{SOURCE2} . + +# Fix bunch of encoding issues + +for file in ReadMe.txt *iwpriv_usage.txt "LICENSE*.txt" README_STA*; do + chmod -x $file iconv -f JOHAB -t UTF8 $file -o $file.tmp sed 's/\r//' $file.tmp > $file.tmp2 mv -f $file.tmp2 $file done # To avoid possible conflict with rt2870 driver: -for sta in include/os/rt_linux.h os/linux/Makefile.6 README_STA* RT2870STACard.dat ; do +for sta in common/rtmp_init.c include/rt_ate.h include/os/rt_linux.h README_STA* RT2870STACard.dat ; do sed 's|RT2870STA|RT3070STA|g' $sta > tmp.sta touch -r $sta tmp.sta mv tmp.sta $sta done %build -# Needed for WPA2 support (RFBZ #664) -sed -i 's|HT_DisallowTKIP=1|HT_DisallowTKIP=0|' RT2870STA.dat sleep 1m %install @@ -53,24 +59,28 @@ install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/ install -pm 0644 RT2870STA.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/RT3070STA.dat install -pm 0644 RT2870STACard.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/RT3070STACard.dat - -cp -a %{SOURCE2} . - +%if 0%{fedora} < 14 install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ cp -a %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ +%endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README_STA_usb *.txt suspend.sh +%doc README_STA_usb *.txt suspend.sh LICENSE*.txt %dir %{_sysconfdir}/Wireless %dir %{_sysconfdir}/Wireless/RT3070STA %config(noreplace) %{_sysconfdir}/Wireless/RT3070STA/RT3070STA*.dat +%if 0%{fedora} < 14 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-rt2800usb.conf +%endif %changelog +* Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 +- Update to 2.3.0.2 + * Fri Dec 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3.1 - Blacklist kernel's rt2800usb module Index: sources =================================================================== RCS file: /cvs/free/rpms/rt3070/F-13/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2009 04:47:43 -0000 1.4 +++ sources 11 Jul 2010 03:22:11 -0000 1.5 @@ -1 +1 @@ -b31ab4d77b6836853e293355915cfcad 2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +18a32c99fd0cd64c3aa9736a90c90795 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 --- ReleaseNote-RT3070.txt DELETED ---

14 years, 5 months

1
0
0 / 0

rpms/rt3070/devel blacklist-rt2800usb.conf, NONE, 1.1 rt3070-allowTKIP.patch, NONE, 1.1

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14429 Added Files: blacklist-rt2800usb.conf rt3070-allowTKIP.patch Log Message: Forgot to commit these two files: blacklist-rt2800usb.conf, rt3070-allowTKIP.patch --- NEW FILE blacklist-rt2800usb.conf --- # This file comes with RPMFusion's rt2870 or rt3070 package. # As of kernel 2.6.31, the module that comes with the kernel gets # loaded for this device and it stops the device from working. So... blacklist rt2800usb rt3070-allowTKIP.patch: RT2870STA.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE rt3070-allowTKIP.patch --- diff -rupN DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/RT2870STA.dat DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/RT2870STA.dat --- DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.old/RT2870STA.dat 2009-12-28 07:38:31.000000000 -0500 +++ DPO_RT3070_LinuxSTA_V2.3.0.2_20100412/RT2870STA.dat 2010-07-10 22:31:56.000000000 -0400 @@ -47,7 +47,7 @@ HT_BAWinSize=64 HT_GI=1 HT_MCS=33 HT_MIMOPSMode=3 -HT_DisallowTKIP=1 +HT_DisallowTKIP=0 EthConvertMode= EthCloneMac= IEEE80211H=0

14 years, 5 months

1
0
0 / 0

rpms/rt3070/devel ReadMe.txt, NONE, 1.1 .cvsignore, 1.4, 1.5 rt3070.spec, 1.7, 1.8 sources, 1.4, 1.5 ReleaseNote-RT3070.txt, 1.2, NONE

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/rt3070/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv12159 Modified Files: .cvsignore rt3070.spec sources Added Files: ReadMe.txt Removed Files: ReleaseNote-RT3070.txt Log Message: * Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 - Update to 2.3.0.2 --- NEW FILE ReadMe.txt --- [2.3.0.1] 1. Fix Shared WEP security mode can't work on wpa_supplicant wext driver. 2. Fix Hidden SSID can't work on wpa_supplicant wext driver. 3. Fix AdHoc mode can't work on wpa_supplicant wext driver. [2.3.0.0] 1. Support PSP XLINK in ad-hoc mode. 2. Add mac80211 iw utility other commands support. 3. Fix issue: The start address of HeaderBuf must be aligned by 4 when VENDOR_FEATURE1_SUPPORT is enabled. 4. WMM ACM: see history of acm_comm.c. 5. Support WpaSupplicant(v0.6.9) WPS 6. Fix WPS issue: Check SelectRegistrar is TRUE or FALSE 7. Fix WPS issue: Some AP (ex. Buffalo WZR-AG300NH) would change SSID to another SSID after push WPS PBC button. After WPS process finish, change SSID to original SSID. Driver needs to wait AP to re-generate Beacon; otherwise, driver will update this PBC SSID to MlmeAux. 8. Shorten the waiting time when unplug the device. 9. Fix mgmt ring full issue: It happened only in big-endian platform and quickly switch the network type between Infra and Adhoc mode. 10. Fix statistics issue: It happened in big-endian platform, tx count would be zero. 11. Support WiFi Draft_3.0 11n test items. 12. Support Linux Kernel 2.6.31 13. Support Ad-hoc WPS2PSK/AES (DPO doesn't support this item) 14. Support Samsung Auto Provision (only for Samsung Project) 15. For GPL issue: Separate three kernel modules - util module, driver module, netif module. util module and netif module could license GPL. 16. Support CFG80211 of Linux Kernel 2.6.32 Driver module couldn't license GPL. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt3070/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Aug 2009 04:47:43 -0000 1.4 +++ .cvsignore 11 Jul 2010 02:38:26 -0000 1.5 @@ -1 +1 @@ -2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 Index: rt3070.spec =================================================================== RCS file: /cvs/free/rpms/rt3070/devel/rt3070.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rt3070.spec 4 Aug 2009 04:50:43 -0000 1.7 +++ rt3070.spec 11 Jul 2010 02:38:26 -0000 1.8 @@ -1,15 +1,22 @@ -%define SourceName 2009_0525_RT3070_Linux_STA_v2.1.1.0 +%define SourceName DPO_RT3070_LinuxSTA_V2.3.0.2_20100412 Name: rt3070 -Version: 2.1.1.0 -Release: 3%{?dist} +Version: 2.3.0.2 +Release: 1%{?dist} Summary: Common files for RaLink rt3070 kernel driver Group: System Environment/Kernel License: GPLv2+ -URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html -Source0: http://www.ralinktech.com.tw/data/drivers/%{SourceName}.bz2 -Source1: http://www.ralinktech.com.tw/data/drivers/ReleaseNote-RT3070.txt +URL: http://www.ralinktech.com/support.php?s=2 +# No more direct link. The file is downloaded from the above page. +Source0: %{SourceName}.tar.bz2 +Source1: ReadMe.txt +# Alternative suspend script. Might not be necessary anymore. +# Kept for historical reasons. Source2: suspend.sh +# Blacklist the module shipped with kernel +Source3: blacklist-rt2800usb.conf +# Needed for WPA2 support (RFBZ #664) +Patch0: rt3070-allowTKIP.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,25 +30,28 @@ %prep %setup -q -n %{SourceName} +%patch0 -p1 -# Fix bunch of encoding issues cp -a %{SOURCE1} . -for file in ReleaseNote* sta_ate_iwpriv_usage.txt README_STA*; do +cp -a %{SOURCE2} . + +# Fix bunch of encoding issues + +for file in ReadMe.txt *iwpriv_usage.txt "LICENSE*.txt" README_STA*; do + chmod -x $file iconv -f JOHAB -t UTF8 $file -o $file.tmp sed 's/\r//' $file.tmp > $file.tmp2 mv -f $file.tmp2 $file done # To avoid possible conflict with rt2870 driver: -for sta in include/os/rt_linux.h os/linux/Makefile.6 README_STA* RT2870STACard.dat ; do +for sta in common/rtmp_init.c include/rt_ate.h include/os/rt_linux.h README_STA* RT2870STACard.dat ; do sed 's|RT2870STA|RT3070STA|g' $sta > tmp.sta touch -r $sta tmp.sta mv tmp.sta $sta done %build -# Needed for WPA2 support (RFBZ #664) -sed -i 's|HT_DisallowTKIP=1|HT_DisallowTKIP=0|' RT2870STA.dat sleep 1m %install @@ -49,20 +59,31 @@ install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/ install -pm 0644 RT2870STA.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/RT3070STA.dat install -pm 0644 RT2870STACard.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT3070STA/RT3070STACard.dat - -cp -a %{SOURCE2} . +%if 0%{fedora} < 14 +install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ +cp -a %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/ +%endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README_STA* *.txt suspend.sh +%doc README_STA_usb *.txt suspend.sh LICENSE*.txt %dir %{_sysconfdir}/Wireless %dir %{_sysconfdir}/Wireless/RT3070STA %config(noreplace) %{_sysconfdir}/Wireless/RT3070STA/RT3070STA*.dat +%if 0%{fedora} < 14 +%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-rt2800usb.conf +%endif %changelog +* Sun Jun 27 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.3.0.2-1 +- Update to 2.3.0.2 + +* Fri Dec 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3.1 +- Blacklist kernel's rt2800usb module + * Tue Aug 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-3 - *sigh* Upstream made a release without bumping the version Index: sources =================================================================== RCS file: /cvs/free/rpms/rt3070/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2009 04:47:43 -0000 1.4 +++ sources 11 Jul 2010 02:38:26 -0000 1.5 @@ -1 +1 @@ -b31ab4d77b6836853e293355915cfcad 2009_0525_RT3070_Linux_STA_v2.1.1.0.bz2 +18a32c99fd0cd64c3aa9736a90c90795 DPO_RT3070_LinuxSTA_V2.3.0.2_20100412.tar.bz2 --- ReleaseNote-RT3070.txt DELETED ---

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits July 2010