Author: oget Update of /cvs/free/rpms/rt2860-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6995 Modified Files: rt2860-kmod.spec rt2860-remove-tftpboot-copy.patch Added Files: rt2860-no2.4-in-kernelversion.patch Log Message: * Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3.6 - Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring rt2860-no2.4-in-kernelversion.patch: --- NEW FILE rt2860-no2.4-in-kernelversion.patch --- --- 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 endif ifeq ($(PLATFORM),PC) - 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 - # Linux 2.6 EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include - endif endif ifeq ($(PLATFORM),IXP) Index: rt2860-kmod.spec =================================================================== RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-kmod.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- rt2860-kmod.spec 15 Mar 2009 15:46:31 -0000 1.29 +++ rt2860-kmod.spec 26 Mar 2009 07:42:27 -0000 1.30 @@ -7,7 +7,7 @@ Name: rt2860-kmod Version: 1.8.0.0 -Release: 3%{?dist}.5 +Release: 3%{?dist}.6 Summary: Kernel module for RaLink 802.11 wireless devices rt2760/rt2790/rt2860/rt2890 Group: System Environment/Kernel @@ -19,7 +19,8 @@ Patch1: rt2860-dat-install-fixes.patch Patch2: rt2860-add-network-mgr-support.diff Patch3: rt2860-remove-tftpboot-copy.patch -Patch5: rt2860-2.6.29-compile.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 @@ -47,7 +48,8 @@ %patch1 -p1 -b .rpmbuild %patch2 -p1 -b .NetworkManager -%patch3 -p1 -b .tftpboot +%patch3 -p0 -b .tftpboot +%patch4 -p0 -b .no24 for kernel_version in %{?kernel_versions} ; do cp -a *RT2860_Linux_STA* _kmod_build_${kernel_version%%___*} @@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.8.0.0-3.6 +- Bugfix: kmod doesn't compile when the kernel version has a "2.4" substring + * Sun Mar 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8.0.0-3.5 - rebuild for new kernels 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rt2860-remove-tftpboot-copy.patch 19 Oct 2008 20:25:42 -0000 1.2 +++ rt2860-remove-tftpboot-copy.patch 26 Mar 2009 07:42:27 -0000 1.3 @@ -1,10 +1,12 @@ -diff -rupN old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile ---- old/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-09-17 22:26:56.000000000 -0400 -+++ new/2008_0918_RT2860_Linux_STA_v1.8.0.0/Makefile 2008-10-19 15:43:22.000000000 -0400 -@@ -125,27 +125,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/ +--- 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: + + + 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 @@ -14,7 +16,7 @@ - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot -endif -endif - else +-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) @@ -26,6 +28,33 @@ - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot -endif -endif - 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