Author: oget Update of /cvs/free/rpms/rt2870-kmod/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2461 Modified Files: rt2870-strip-tftpboot-copy.patch Log Message: Update patch to fix the "2.4 in kernel version" issue rt2870-strip-tftpboot-copy.patch: Index: rt2870-strip-tftpboot-copy.patch =================================================================== RCS file: /cvs/free/rpms/rt2870-kmod/F-9/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:38:45 -0000 1.2 +++ rt2870-strip-tftpboot-copy.patch 26 Mar 2009 06:34:26 -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