Author: oget Update of /cvs/free/rpms/rt2860-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22237 Modified Files: .cvsignore rt2860-add-network-mgr-support.diff rt2860-dat-install-fixes.patch rt2860-kmod.spec rt2860-no2.4-in-kernelversion.patch rt2860-remove-tftpboot-copy.patch sources Removed Files: rt2860-2.6.29-compile.patch Log Message: * Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-1 - version update (2.1.0.0) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Oct 2008 18:54:16 -0000 1.3 +++ .cvsignore 21 Apr 2009 03:11:31 -0000 1.4 @@ -1 +1 @@ -2008_0918_RT2860_Linux_STA_v1.8.0.0.tar.bz2 +2009_0420_RT2860_Linux_STA_V2.1.0.0.tar.gz rt2860-add-network-mgr-support.diff: Index: rt2860-add-network-mgr-support.diff =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-add-network-mgr-support.diff,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt2860-add-network-mgr-support.diff 19 Oct 2008 20:25:42 -0000 1.2 +++ rt2860-add-network-mgr-support.diff 21 Apr 2009 03:11:31 -0000 1.3 @@ -1,15 +1,17 @@ ---- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/config.mk 2008-09-25 04:25:42.000000000 -0400 -+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/config.mk 2008-10-04 16:39:05.000000000 -0400 -@@ -5,10 +5,10 @@ HAS_ATE=n - HAS_28xx_QA=n +--- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/config.mk 2009-03-26 20:20:43.000000000 -0400 ++++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/config.mk 2009-04-20 21:26:04.000000000 -0400 +@@ -6,12 +6,12 @@ HAS_28xx_QA=n + #ifdef WPA_SUPPLICANT_SUPPORT # Support Wpa_Supplicant -HAS_WPA_SUPPLICANT=n +HAS_WPA_SUPPLICANT=y + #endif // WPA_SUPPLICANT_SUPPORT // + #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT # Support Native WpaSupplicant for Network Maganger -HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n +HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + #endif // NATIVE_WPA_SUPPLICANT_SUPPORT // #Support Net interface block while Tx-Sw queue full - HAS_BLOCK_NET_IF=n rt2860-dat-install-fixes.patch: Index: rt2860-dat-install-fixes.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-dat-install-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt2860-dat-install-fixes.patch 19 Oct 2008 20:25:42 -0000 1.2 +++ rt2860-dat-install-fixes.patch 21 Apr 2009 03:11:31 -0000 1.3 @@ -1,8 +1,8 @@ -diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4 new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4 ---- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4 2008-09-18 04:12:12.000000000 -0400 -+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.4 2008-10-04 16:51:37.000000000 -0400 +diff -rupN DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.4 DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.4 +--- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.4 2009-03-25 03:42:46.000000000 -0400 ++++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.4 2009-04-20 21:21:26.000000000 -0400 @@ -1,8 +1,6 @@ - include $(RT28xx_DIR)/os/linux/config.mk + include $(RT28xx_DIR)/os/linux/config.mk MOD_NAME = rt$(CHIPSET)sta -DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA @@ -10,7 +10,7 @@ OBJ := $(MOD_NAME).o -@@ -78,15 +76,12 @@ clean: +@@ -93,15 +91,10 @@ clean: rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d} install: @@ -21,20 +21,18 @@ - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} -+ #install -d $(LINUX_SRC_MODULE) -+ #install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) + mkdir -p $(INST_DIR) -+ install -d $(INST_DIR) -+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR) -+ #/sbin/depmod -a ${shell uname -r} ++ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR) uninstall: --# rm -rf $(DAT_PATH) + # rm -rf $(DAT_PATH) - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME))) - /sbin/depmod -a ${shell uname -r} -diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6 new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6 ---- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6 2008-09-18 04:12:42.000000000 -0400 -+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/Makefile.6 2008-10-04 16:50:54.000000000 -0400 +- /sbin/depmod -a ${shell uname -r} ++ rm -rf $(addprefix $(INST_DIR),$(addsuffix .o,$(MOD_NAME))) ++ +diff -rupN DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.6 DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.6 +--- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/Makefile.6 2009-03-25 03:43:06.000000000 -0400 ++++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/Makefile.6 2009-04-20 21:22:45.000000000 -0400 @@ -1,8 +1,6 @@ include $(RT28xx_DIR)/os/linux/config.mk @@ -44,7 +42,7 @@ obj-m := $(MOD_NAME).o -@@ -77,15 +75,11 @@ clean: +@@ -88,15 +86,10 @@ clean: rm -f ../../sta/.*.{cmd,flags,d} install: @@ -55,13 +53,12 @@ - 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 -d $(INST_DIR) -+ #install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) -+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR) -+ #/sbin/depmod -a ${shell uname -r} ++ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(INST_DIR) + uninstall: --# rm -rf $(DAT_PATH) - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) - /sbin/depmod -a ${shell uname -r} + # rm -rf $(DAT_PATH) +- rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) +- /sbin/depmod -a ${shell uname -r} ++ rm -rf $(addprefix $(INST_DIR),$(addsuffix .ko,$(MOD_NAME))) ++ Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-kmod.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- rt2860-kmod.spec 5 Apr 2009 16:09:27 -0000 1.32 +++ rt2860-kmod.spec 21 Apr 2009 03:11:31 -0000 1.33 @@ -3,30 +3,29 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -#define buildforkernels newest +#%%define buildforkernels newest Name: rt2860-kmod -Version: 1.8.0.0 -Release: 4%{?dist}.7 +Version: 2.1.0.0 +Release: 1%{?dist} Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 Group: System Environment/Kernel License: GPLv2+ URL: http://www.ralinktech.com/ralink/Home/Support/Linux.html -Source0: http://www.ralinktech.com.tw/data/drivers/2008_0918_RT2860_Linux_STA_v1.8... +Source0: http://www.ralinktech.com.tw/data/drivers/2009_0420_RT2860_Linux_STA_V2.1... Source11: rt2860-kmodtool-excludekernel-filterfile Patch1: rt2860-dat-install-fixes.patch Patch2: rt2860-add-network-mgr-support.diff Patch3: rt2860-remove-tftpboot-copy.patch Patch4: rt2860-no2.4-in-kernelversion.patch -Patch5: rt2860-2.6.29-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool # needed for plague to make sure it builds for i586 and i686 -ExclusiveArch: i586 i686 x86_64 ppc ppc64 +ExclusiveArch: i586 i686 x86_64 ppc ppc64 %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } @@ -46,18 +45,17 @@ %setup -q -c -T -a 0 -%patch1 -p1 -b .rpmbuild -%patch2 -p1 -b .NetworkManager +%patch1 -p0 -b .rpmbuild +%patch2 -p0 -b .NetworkManager %patch3 -p0 -b .tftpboot %patch4 -p0 -b .no24 +# Fix weird permissions +find . -name "*.c" -exec chmod -x {} \; +find . -name "*.h" -exec chmod -x {} \; + for kernel_version in %{?kernel_versions} ; do - cp -a *RT2860_Linux_STA* _kmod_build_${kernel_version%%___*} - pushd _kmod_build_${kernel_version%%___*} - if [[ $kernel_version > "2.6.29" ]]; then -%patch5 -p2 -b .2.6.29 - fi - popd + cp -a *RT2860_Linux*STA* _kmod_build_${kernel_version%%___*} done %build @@ -78,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-1 +- version update (2.1.0.0) + * Sun Apr 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8.0.0-4.7 - rebuild for new kernels rt2860-no2.4-in-kernelversion.patch: Index: rt2860-no2.4-in-kernelversion.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-no2.4-in-kernelversion.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rt2860-no2.4-in-kernelversion.patch 26 Mar 2009 07:42:27 -0000 1.1 +++ rt2860-no2.4-in-kernelversion.patch 21 Apr 2009 03:11:31 -0000 1.2 @@ -1,6 +1,6 @@ ---- 2008_0918_RT2860_Linux_STA_v1.8.0.0.old/os/linux/config.mk 2008-09-17 23:27:46.000000000 -0400 -+++ 2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/config.mk 2009-03-26 03:02:19.000000000 -0400 -@@ -223,14 +223,7 @@ export CFLAGS +--- DPO_RT2860_LinuxSTA_V2.1.0.0.old/os/linux/config.mk 2009-04-20 21:30:17.000000000 -0400 ++++ DPO_RT2860_LinuxSTA_V2.1.0.0/os/linux/config.mk 2009-04-20 21:31:04.000000000 -0400 +@@ -235,14 +235,7 @@ export CFLAGS endif ifeq ($(PLATFORM),PC) rt2860-remove-tftpboot-copy.patch: Index: rt2860-remove-tftpboot-copy.patch =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-remove-tftpboot-copy.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rt2860-remove-tftpboot-copy.patch 26 Mar 2009 07:42:27 -0000 1.3 +++ rt2860-remove-tftpboot-copy.patch 21 Apr 2009 03:11:31 -0000 1.4 @@ -1,34 +1,18 @@ ---- 2008_0918_RT2860_Linux_STA_v1.8.0.0.old/Makefile 2008-09-17 22:26:56.000000000 -0400 -+++ 2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2009-03-26 03:00:09.000000000 -0400 -@@ -122,57 +122,20 @@ build_tools: +--- DPO_RT2860_LinuxSTA_V2.1.0.0.old/Makefile 2009-03-25 03:50:55.000000000 -0400 ++++ DPO_RT2860_LinuxSTA_V2.1.0.0/Makefile 2009-04-20 21:29:18.000000000 -0400 +@@ -134,41 +134,20 @@ 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/ --ifeq ($(RT28xx_MODE),AP) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot --else --ifeq ($(RT28xx_MODE),APSTA) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot --else - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot --endif --endif -else cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules --ifeq ($(RT28xx_MODE),AP) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot --else --ifeq ($(RT28xx_MODE),APSTA) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot --else - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot -endif --endif --endif clean: ifeq ($(TARGET), LINUX) Index: sources =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Oct 2008 18:54:16 -0000 1.3 +++ sources 21 Apr 2009 03:11:31 -0000 1.4 @@ -1 +1 @@ -cc6167b73fd26cd6ffbbf41444ec5bdc 2008_0918_RT2860_Linux_STA_v1.8.0.0.tar.bz2 +3880751dd802f12a40c211eff2599c04 2009_0420_RT2860_Linux_STA_V2.1.0.0.tar.gz --- rt2860-2.6.29-compile.patch DELETED ---