6:33 p.m.
Author: thl
Update of /cvs/free/rpms/rt2870-kmod/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25226
Modified Files:
.cvsignore sources
Added Files:
rt2870-2.6.25-iwe_stream-fix.patch
rt2870-Makefile.x-fixes.patch
rt2870-NetworkManager-support.patch rt2870-kmod.spec
rt2870-kmodtool-excludekernel-filterfile
rt2870-linksys-wusb100-support.patch
rt2870-strip-tftpboot-copy.patch
Log Message:
import rt2870 ( https://bugzilla.rpmfusion.org/show_bug.cgi?id=46#c7)
rt2870-2.6.25-iwe_stream-fix.patch:
--- NEW FILE rt2870-2.6.25-iwe_stream-fix.patch ---
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c
new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/sta_ioctl.c 2008-09-25
04:28:00.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.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)
rt2870-Makefile.x-fixes.patch:
--- NEW FILE rt2870-Makefile.x-fixes.patch ---
diff -rupN old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/Makefile.4
new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/Makefile.4
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/Makefile.4 2008-09-18
04:12:12.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.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_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/Makefile.6
new/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/Makefile.6
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/Makefile.6 2008-09-18
04:12:42.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.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}
rt2870-NetworkManager-support.patch:
--- NEW FILE rt2870-NetworkManager-support.patch ---
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/os/linux/config.mk 2008-09-25
04:25:42.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.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
--- NEW FILE rt2870-kmod.spec ---
# buildforkernels macro hint: when you build a new version or a new release
# that contains bugfixes or other improvements then you must disable the
# "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
Name: rt2870-kmod
Version: 1.4.0.0
Release: 1%{?dist}.1
Summary: Kernel module for wireless devices with Ralink's rt2870 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/2008_0925_RT2870_Linux_STA_v1.4...
Source11: rt2870-kmodtool-excludekernel-filterfile
Patch0: rt2870-2.6.25-iwe_stream-fix.patch
Patch1: rt2870-linksys-wusb100-support.patch
Patch2: rt2870-Makefile.x-fixes.patch
Patch3: rt2870-NetworkManager-support.patch
Patch4: rt2870-strip-tftpboot-copy.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 ppc64
# ppc disabled by knurd on 20081003 as it is known to fail on 2.6.26:
# https://bugzilla.redhat.com/show_bug.cgi?id=464613
%{!?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) }
%description
This package contains the documentation and configuration files for the Ralink
Driver for WiFi, a linux device driver for 802.11a/b/g universal NIC cards -
either PCI, PCIe or MiniPCI - that use Ralink rt2870 chipsets.
%prep
%{?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
%setup -q -c -T -a 0
%patch0 -p1 -b .iwestream
%patch1 -p1 -b .linksys
%patch2 -p1 -b .rpmbuild
%patch3 -p1 -b .NetworkManager
%patch4 -p1 -b .tftpboot
for kernel_version in %{?kernel_versions} ; do
cp -a *RT2870_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%%___*}
KERNELPATH="${kernel_version##*___}"
KERNELRELEASE="${kernel_version%%___*}"
INST_DIR=${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
install
done
chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/*
%{?akmod_install}
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Oct 05 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.4.0.0-1.1
- adjust make call in build to build properly is running kernel and target
kernel are different
* Sat Oct 04 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.4.0.0-1
- Rebuild for 1.4.0.0
* Sat Oct 04 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.3.1.0-4
- Various small adjustments
- exclude ppc due to bugs (see comments)
* Sat Sep 26 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.3.1.0-3
- Re-wrote the description, removed supported hardware info.
- Renamed SourceDir to SourceName
* Thu Sep 22 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.3.1.0-2
- Some cleanup in the SPEC file to match standards
- Separated the patches
- License is GPLv2+
* Thu Sep 20 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.3.1.0-1
- Initial build. The patch fixes compilation problems for kernels >= 2.6.25 . Also adds
support for Linksys WUSB100.
--- NEW FILE rt2870-kmodtool-excludekernel-filterfile ---
xen$
rt2870-linksys-wusb100-support.patch:
--- NEW FILE rt2870-linksys-wusb100-support.patch ---
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/include/rt2870.h 2008-09-19 01:23:42.000000000
-0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.0.0/include/rt2870.h 2008-10-04 16:20:58.000000000
-0400
@@ -143,6 +143,7 @@
{USB_DEVICE(0x0789,0x0162)}, /* Logitec */ \
{USB_DEVICE(0x0789,0x0163)}, /* Logitec */ \
{USB_DEVICE(0x0789,0x0164)}, /* Logitec */ \
+ {USB_DEVICE(0x1737,0x0070)}, /* Linksys WUSB100 */ \
{ }/* Terminating entry */ \
}
rt2870-strip-tftpboot-copy.patch:
--- NEW FILE rt2870-strip-tftpboot-copy.patch ---
--- old/2008_0925_RT2870_Linux_STA_v1.4.0.0/Makefile 2008-09-18 03:55:04.000000000 -0400
+++ new/2008_0925_RT2870_Linux_STA_v1.4.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/rt2870-kmod/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Oct 2008 13:28:56 -0000 1.1
+++ .cvsignore 5 Oct 2008 18:33:06 -0000 1.2
@@ -0,0 +1 @@
+2008_0925_RT2870_Linux_STA_v1.4.0.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Oct 2008 13:28:56 -0000 1.1
+++ sources 5 Oct 2008 18:33:06 -0000 1.2
@@ -0,0 +1 @@
+3ad8bc242907031c49436429f28bdd60 2008_0925_RT2870_Linux_STA_v1.4.0.0.tar.bz2