rpms/rt2870-kmod/devel rt2870-no2.4-in-kernelversion.patch, NONE, 1.1 rt2870-kmod.spec, 1.33, 1.34 rt2870-strip-tftpboot-copy.patch, 1.2, 1.3

[Orcan Ogetbil]

Author: oget

Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3624

Modified Files:
	rt2870-kmod.spec rt2870-strip-tftpboot-copy.patch 
Added Files:
	rt2870-no2.4-in-kernelversion.patch 
Log Message:
* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring


rt2870-no2.4-in-kernelversion.patch:

--- NEW FILE rt2870-no2.4-in-kernelversion.patch ---
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
 endif
 
 ifeq ($(PLATFORM),PC)
-    ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+	#    ifneq (,$(findstring 2.4,$(LINUX_SRC)))
 	# 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)


Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rt2870-kmod.spec	26 Mar 2009 05:25:46 -0000	1.33
+++ rt2870-kmod.spec	26 Mar 2009 06:50:08 -0000	1.34
@@ -3,11 +3,11 @@
 # "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:		rt2870-kmod
 Version:	2.1.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Kernel module for wireless devices with Ralink's rt2870 chipsets
 
 Group:		System Environment/Kernel
@@ -15,6 +15,7 @@
 URL:		http://www.ralinktech.com/ralink/Home/Support/Linux.html
 Source0:	http://www.ralinktech.com.tw/data/drivers/2009_0302_RT2870_Linux_STA_v2.1.0.0.tar.bz2
 Source11:	rt2870-kmodtool-excludekernel-filterfile
+Patch1:		rt2870-no2.4-in-kernelversion.patch
 Patch2:		rt2870-Makefile.x-fixes.patch
 Patch3:		rt2870-NetworkManager-support.patch
 Patch4:		rt2870-strip-tftpboot-copy.patch
@@ -44,6 +45,7 @@
 
 %setup -q -c -T -a 0
 
+%patch1 -p0 -b .no24
 %patch2 -p0 -b .rpmbuild
 %patch3 -p0 -b .NetworkManager
 %patch4 -p0 -b .tftpboot
@@ -76,6 +78,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-2
+- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring
+
 * Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.0.0-1
 - New upstream version
 - Drop additional-devices patch since it is upstreamed

rt2870-strip-tftpboot-copy.patch:

Index: rt2870-strip-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-strip-tftpboot-copy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt2870-strip-tftpboot-copy.patch	26 Mar 2009 05:18:48 -0000	1.2
+++ rt2870-strip-tftpboot-copy.patch	26 Mar 2009 06:50:08 -0000	1.3
@@ -1,16 +1,45 @@
 --- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/Makefile	2009-02-27 06:28:45.000000000 -0500
-+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile	2009-03-25 20:44:41.000000000 -0400
-@@ -137,11 +137,11 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- 	cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- 	make -C $(RT28xx_DIR)/os/linux/
++++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/Makefile	2009-03-26 02:28:12.000000000 -0400
+@@ -134,41 +134,23 @@ 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
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
- else
+-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
-+#	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
- endif	
+-endif	
  
  clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-	cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ 	cp -f os/linux/Makefile.6 os/linux/Makefile
+-endif
++
+ 	make -C os/linux clean
+ 	rm -rf os/linux/Makefile
+ endif	
+ 
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-	make -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ 	make -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+ 
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-	make -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ 	make -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
+ endif
+-endif