Author: oget Update of /cvs/free/rpms/rt2860-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19202 Modified Files: .cvsignore rt2860-kmod.spec sources Added Files: rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch rt2860-1.8.0.0-Makefile.x-fixes.patch rt2860-1.8.0.0-NetworkManager-support.patch rt2860-1.8.0.0-strip-tftpboot-copy.patch Log Message: * Sun Oct 19 2008 Orcan Ogetbil <orcanbahri[at]yahoo[com]> 1.8.0.0-1 - version update (1.8.0.0) - patches taken from rt2870-kmod directly rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch: --- NEW FILE rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch --- diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2008-09-25 04:28:00.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/os/linux/sta_ioctl.c 2008-10-04 16:15:19.000000000 -0400 @@ -49,7 +49,7 @@ extern ULONG RTDebugLevel; #define GROUP_KEY_NO 4 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) #define IWE_STREAM_ADD_EVENT(_A, _B, _C, _D, _E) iwe_stream_add_event(_A, _B, _C, _D, _E) #define IWE_STREAM_ADD_POINT(_A, _B, _C, _D, _E) iwe_stream_add_point(_A, _B, _C, _D, _E) #define IWE_STREAM_ADD_VALUE(_A, _B, _C, _D, _E, _F) iwe_stream_add_value(_A, _B, _C, _D, _E, _F) rt2860-1.8.0.0-Makefile.x-fixes.patch: --- NEW FILE rt2860-1.8.0.0-Makefile.x-fixes.patch --- 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 @@ -1,8 +1,6 @@ include $(RT28xx_DIR)/os/linux/config.mk MOD_NAME = rt$(CHIPSET)sta -DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA -DAT_FILE_NAME = RT$(CHIPSET)STA.dat OBJ := $(MOD_NAME).o @@ -78,15 +76,12 @@ clean: rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d} install: - rm -rf $(DAT_PATH) - $(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless) - mkdir $(DAT_PATH) - cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/. - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) - /sbin/depmod -a ${shell uname -r} + #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} uninstall: -# 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 @@ -1,8 +1,6 @@ include $(RT28xx_DIR)/os/linux/config.mk MOD_NAME = rt$(CHIPSET)sta -DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA -DAT_FILE_NAME = RT$(CHIPSET)STA.dat obj-m := $(MOD_NAME).o @@ -77,15 +75,11 @@ clean: rm -f ../../sta/.*.{cmd,flags,d} install: - rm -rf $(DAT_PATH) - $(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless) - mkdir $(DAT_PATH) - cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/. - install -d $(LINUX_SRC_MODULE) - install -m 644 -c $(addsuffix .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} uninstall: -# rm -rf $(DAT_PATH) rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) /sbin/depmod -a ${shell uname -r} rt2860-1.8.0.0-NetworkManager-support.patch: --- NEW FILE rt2860-1.8.0.0-NetworkManager-support.patch --- --- 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 # Support Wpa_Supplicant -HAS_WPA_SUPPLICANT=n +HAS_WPA_SUPPLICANT=y # Support Native WpaSupplicant for Network Maganger -HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n +HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y #Support Net interface block while Tx-Sw queue full HAS_BLOCK_NET_IF=n rt2860-1.8.0.0-strip-tftpboot-copy.patch: --- NEW FILE rt2860-1.8.0.0-strip-tftpboot-copy.patch --- --- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-09-18 03:55:04.000000000 -0400 +++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-10-04 16:47:15.000000000 -0400 @@ -130,27 +130,9 @@ 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 release: Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Oct 2008 20:36:05 -0000 1.2 +++ .cvsignore 19 Oct 2008 18:54:16 -0000 1.3 @@ -1 +1 @@ -2008_0708_RT2860_Linux_STA_v1.7.0.0.tar.bz2 +2008_0918_RT2860_Linux_STA_v1.8.0.0.tar.bz2 Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-kmod.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rt2860-kmod.spec 19 Oct 2008 12:16:03 -0000 1.6 +++ rt2860-kmod.spec 19 Oct 2008 18:54:16 -0000 1.7 @@ -3,36 +3,33 @@ # "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 -%define SourceDir 2008_0708_RT2860_Linux_STA_v1.7.0.0 -%define _default_patch_fuzz 2 +Name: rt2860-kmod +Version: 1.8.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... +Source11: rt2860-kmodtool-excludekernel-filterfile +Patch0: rt2860-1.8.0.0-2.6.25-iwe_stream-fix.patch +Patch1: rt2860-1.8.0.0-Makefile.x-fixes.patch +Patch2: rt2860-1.8.0.0-NetworkManager-support.patch +Patch3: rt2860-1.8.0.0-strip-tftpboot-copy.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Name: rt2860-kmod -Version: 1.7.0 -Release: 6%{?dist}.2 -Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 - -Group: System Environment/Kernel -License: GPLv2+ -URL: http://www.ralinktech.com/ -Source0: http://www.ralinktech.com.tw/data/drivers/%{SourceDir}.tar.bz2 -Source11: rt2860-kmodtool-excludekernel-filterfile -Patch0: rt2860-remove-tftpboot-copy.patch -Patch1: rt2860-add-network-mgr-support.diff -Patch2: rt2860-dat-install-fixes.patch -Patch3: rt2860-2.6.25-iwe_stream-fix.diff -Patch4: rt2860-net-namespace-separation.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 and ppc64 disabled by knurd on 20081003 as it is known to fail on 2.6.27: +# ppc and ppc64 disabled by knurd on 20081003 as it is known to fail on 2.6.27: # https://bugzilla.redhat.com/show_bug.cgi?id=465486 -# get the needed BuildRequires (in parts depending on what we build for) -BuildRequires: %{_bindir}/kmodtool %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } + # kmodtool does its magic here %{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } @@ -42,55 +39,46 @@ MiniPCI - that use Ralink chipsets (rt2760, rt2790, rt2860, rt2890). %prep -# error out if there was something wrong with kmodtool %{?kmodtool_check} + # print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + %setup -q -c -T -a 0 -(cd %{SourceDir} ; -%patch0 -p1 -b .tftpboot -%patch1 -p1 -b .network-mgr -%patch2 -p1 -b .dat-install -%patch3 -p1 -b .2.6.25.fixes -%patch4 -p1 -b .patch -) -for kernel_version in %{?kernel_versions} ; do - cp -a %{SourceDir} _kmod_build_${kernel_version%%___*} -done +%patch0 -p1 -b .iwestream +%patch1 -p1 -b .rpmbuild +%patch2 -p1 -b .NetworkManager +%patch3 -p1 -b .tftpboot -%build -for kernel_version in %{?kernel_versions} ; do - pushd _kmod_build_${kernel_version%%___*} - make LINUX_SRC="${kernel_version##*___}" - popd +for kernel_version in %{?kernel_versions} ; do + cp -a *RT2860_Linux_STA* _kmod_build_${kernel_version%%___*} done +%build +for kernel_version in %{?kernel_versions}; do + make -C _kmod_build_${kernel_version%%___*} LINUX_SRC="${kernel_version##*___}" +done %install -rm -rf $RPM_BUILD_ROOT -for kernel_version in %{?kernel_versions} ; do - make -C _kmod_build_${kernel_version%%___*} LINUX_SRC="${kernel_version##*___}" LINUX_SRC_MODULE=$RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} DAT_PREFIX=$RPM_BUILD_ROOT install +rm -rf ${RPM_BUILD_ROOT} +for kernel_version in %{?kernel_versions}; do + make -C _kmod_build_${kernel_version%%___*} KERNELPATH="${kernel_version##*___}" KERNELRELEASE="${kernel_version%%___*}" INST_DIR=${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} install done -# allow stripping: -chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/* || : -# file is part of the common package: -rm -fr $RPM_BUILD_ROOT/etc || : -# akmods: +chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/* %{?akmod_install} - %clean rm -rf $RPM_BUILD_ROOT - %changelog -* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.7.0-6.2 -- rebuild for latest rawhide kernel +* Sun Oct 19 2008 Orcan Ogetbil <orcanbahri[at]yahoo[com]> 1.8.0.0-1 +- version update (1.8.0.0) +- patches taken from rt2870-kmod directly * Tue Oct 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-6.1 -- disable ppc ppc64; both fail +- disable ppc ppc64; both fail * Tue Oct 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-5.1 - rebuild for RPM Fusion @@ -102,7 +90,7 @@ * Fri Sep 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-3 - add rt2860-net-namespace-separation.patch to make it compile with 2.6.26.3 from Fedora; patch provided by James as text in #2083 -- License is GPLv2+ +- License is GPLv2+ * Fri Sep 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.7.0-2 - some small fixes and cleanups Index: sources =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Oct 2008 20:36:05 -0000 1.2 +++ sources 19 Oct 2008 18:54:16 -0000 1.3 @@ -1 +1 @@ -523a42e4a86cf627dd34917e93fa2ce5 2008_0708_RT2860_Linux_STA_v1.7.0.0.tar.bz2 +cc6167b73fd26cd6ffbbf41444ec5bdc 2008_0918_RT2860_Linux_STA_v1.8.0.0.tar.bz2