From 0a6237aabb423d28a4d87d84c6f6ba4b2ff710c6 Mon Sep 17 00:00:00 2001 From: Roberto Neri Date: Thu, 31 Oct 2013 20:46:07 -0500 Subject: network/rt5370: Updated for version 2.6.1.3. Signed-off-by: Robby Workman --- network/rt5370/README | 7 +- network/rt5370/patches/Makefile.4.diff | 20 --- network/rt5370/patches/Makefile.4.netif.diff | 14 -- network/rt5370/patches/Makefile.4.util.diff | 14 -- network/rt5370/patches/Makefile.6.diff | 20 --- network/rt5370/patches/Makefile.6.netif.diff | 14 -- network/rt5370/patches/Makefile.6.util.diff | 17 -- network/rt5370/patches/Makefile.diff | 33 ---- network/rt5370/patches/config.mk.diff | 25 --- network/rt5370/rt5370-2.6.1.3.patch | 231 +++++++++++++++++++++++++++ network/rt5370/rt5370.SlackBuild | 22 +-- network/rt5370/rt5370.info | 8 +- network/rt5370/slack-desc | 2 +- 13 files changed, 249 insertions(+), 178 deletions(-) delete mode 100644 network/rt5370/patches/Makefile.4.diff delete mode 100644 network/rt5370/patches/Makefile.4.netif.diff delete mode 100644 network/rt5370/patches/Makefile.4.util.diff delete mode 100644 network/rt5370/patches/Makefile.6.diff delete mode 100644 network/rt5370/patches/Makefile.6.netif.diff delete mode 100644 network/rt5370/patches/Makefile.6.util.diff delete mode 100644 network/rt5370/patches/Makefile.diff delete mode 100644 network/rt5370/patches/config.mk.diff create mode 100644 network/rt5370/rt5370-2.6.1.3.patch (limited to 'network') diff --git a/network/rt5370/README b/network/rt5370/README index 045b2e7a0e..39c365a460 100644 --- a/network/rt5370/README +++ b/network/rt5370/README @@ -6,4 +6,9 @@ NONE, WEP, TKIP and AES encryption. If you wish to build the package for a kernel different from the running one, pass its release no. to the script in the KERNEL variable, e.g. -KERNEL=2.6.38.8 ./rt5370.SlackBuild +KERNEL=3.4.66 ./rt5370.SlackBuild + +Note: it may be necessary to create a blacklist file to avoid conflicts +with stock kernel modules, e.g. + +echo "blacklist rt2800usb" > /etc/modprobe.d/rt5370.conf diff --git a/network/rt5370/patches/Makefile.4.diff b/network/rt5370/patches/Makefile.4.diff deleted file mode 100644 index f57772388a..0000000000 --- a/network/rt5370/patches/Makefile.4.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/os/linux/Makefile.4 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/Makefile.4 2012-06-20 14:34:49.503183209 +0200 -@@ -266,13 +266,10 @@ - endif - - 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} -+ mkdir -p $(DESTDIR)/$(DAT_PATH) -+ cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DESTDIR)/$(DAT_PATH) -+ install -d $(DESTDIR)/$(LINUX_SRC_MODULE) -+ install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(DESTDIR)/$(LINUX_SRC_MODULE) - - uninstall: - # rm -rf $(DAT_PATH) diff --git a/network/rt5370/patches/Makefile.4.netif.diff b/network/rt5370/patches/Makefile.4.netif.diff deleted file mode 100644 index 8a7a7f744f..0000000000 --- a/network/rt5370/patches/Makefile.4.netif.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/os/linux/Makefile.4.netif 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/Makefile.4.netif 2012-06-20 14:37:13.111387859 +0200 -@@ -362,9 +362,8 @@ - endif - - install: -- install -d $(LINUX_SRC_MODULE) -- install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) -- /sbin/depmod -a ${shell uname -r} -+ install -d $(DESTDIR)/$(LINUX_SRC_MODULE) -+ install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(DESTDIR)/$(LINUX_SRC_MODULE) - - uninstall: - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME))) diff --git a/network/rt5370/patches/Makefile.4.util.diff b/network/rt5370/patches/Makefile.4.util.diff deleted file mode 100644 index ef739885a2..0000000000 --- a/network/rt5370/patches/Makefile.4.util.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/os/linux/Makefile.4.util 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/Makefile.4.util 2012-06-20 14:38:28.727442528 +0200 -@@ -97,9 +97,8 @@ - endif - - install: -- install -d $(LINUX_SRC_MODULE) -- install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) -- /sbin/depmod -a ${shell uname -r} -+ install -d $(DESTDIR)/$(LINUX_SRC_MODULE) -+ install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(DESTDIR)/$(LINUX_SRC_MODULE) - - uninstall: - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME))) diff --git a/network/rt5370/patches/Makefile.6.diff b/network/rt5370/patches/Makefile.6.diff deleted file mode 100644 index 6f3360d182..0000000000 --- a/network/rt5370/patches/Makefile.6.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/os/linux/Makefile.6 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/Makefile.6 2012-06-20 14:40:03.119262468 +0200 -@@ -356,13 +356,10 @@ - endif - - 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 $(DESTDIR)/$(DAT_PATH) -+ cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DESTDIR)/$(DAT_PATH) -+ install -d $(DESTDIR)/$(LINUX_SRC_MODULE) -+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(DESTDIR)/$(LINUX_SRC_MODULE) - - uninstall: - # rm -rf $(DAT_PATH) diff --git a/network/rt5370/patches/Makefile.6.netif.diff b/network/rt5370/patches/Makefile.6.netif.diff deleted file mode 100644 index be0769f451..0000000000 --- a/network/rt5370/patches/Makefile.6.netif.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/os/linux/Makefile.6.netif 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/Makefile.6.netif 2012-06-20 14:41:11.367409249 +0200 -@@ -371,9 +371,8 @@ - endif - - install: -- install -d $(LINUX_SRC_MODULE) -- install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) -- /sbin/depmod -a ${shell uname -r} -+ install -d $(DESTDIR)/$(LINUX_SRC_MODULE) -+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(DESTDIR)/$(LINUX_SRC_MODULE) - - uninstall: - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) diff --git a/network/rt5370/patches/Makefile.6.util.diff b/network/rt5370/patches/Makefile.6.util.diff deleted file mode 100644 index a469ef342d..0000000000 --- a/network/rt5370/patches/Makefile.6.util.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/os/linux/Makefile.6.util 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/Makefile.6.util 2012-06-20 14:42:29.777428989 +0200 -@@ -106,10 +106,9 @@ - endif - - install: -- install -d $(LINUX_SRC_MODULE) -- install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) -- /sbin/depmod -a ${shell uname -r} -+ install -d $(DESTDIR)/$(LINUX_SRC_MODULE) -+ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(DESTDIR)/$(LINUX_SRC_MODULE) - - uninstall: - rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) -- /sbin/depmod -a ${shell uname -r} -\ No newline at end of file -+ /sbin/depmod -a ${shell uname -r} diff --git a/network/rt5370/patches/Makefile.diff b/network/rt5370/patches/Makefile.diff deleted file mode 100644 index 58dc8e17e9..0000000000 --- a/network/rt5370/patches/Makefile.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/Makefile 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/Makefile 2012-06-20 15:13:00.545541237 +0200 -@@ -170,10 +170,10 @@ - - ifeq ($(PLATFORM),PC) - # Linux 2.6 --LINUX_SRC = /lib/modules/$(shell uname -r)/build -+LINUX_SRC = /lib/modules/$(KERNEL)/build - # Linux 2.4 Change to your local setting - #LINUX_SRC = /usr/src/linux-2.4 --LINUX_SRC_MODULE = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless/ -+LINUX_SRC_MODULE = /lib/modules/$(KERNEL)/kernel/drivers/net/wireless/ - CROSS_COMPILE = - endif - -@@ -339,7 +339,7 @@ - cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot - endif - else -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot -+ true - ifeq ($(OSABL),YES) - cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot - cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot -@@ -385,7 +385,7 @@ - cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot - endif - else -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot -+ true - ifeq ($(OSABL),YES) - cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot - cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot diff --git a/network/rt5370/patches/config.mk.diff b/network/rt5370/patches/config.mk.diff deleted file mode 100644 index c726100a64..0000000000 --- a/network/rt5370/patches/config.mk.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.orig/os/linux/config.mk 2011-07-19 10:56:36.000000000 +0200 -+++ 2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO/os/linux/config.mk 2012-06-20 08:51:51.680101903 +0200 -@@ -40,7 +40,7 @@ - HAS_RSSI_FEEDBACK=n - - # Support XLINK mode --HAS_XLINK=n -+HAS_XLINK=y - - - HAS_NINTENDO=n -@@ -53,11 +53,11 @@ - HAS_APCLI=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 diff --git a/network/rt5370/rt5370-2.6.1.3.patch b/network/rt5370/rt5370-2.6.1.3.patch new file mode 100644 index 0000000000..7818026417 --- /dev/null +++ b/network/rt5370/rt5370-2.6.1.3.patch @@ -0,0 +1,231 @@ +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/Makefile DPO_RT5572_LinuxSTA_2.6.1.3_20121022/Makefile +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/Makefile 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/Makefile 2013-09-29 08:42:46.842805675 +0200 +@@ -355,28 +355,28 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)ap.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)ap.o /tftpboot +-endif ++# cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)ap.o /tftpboot ++#ifeq ($(OSABL),YES) ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)ap.o /tftpboot ++#endif + ifeq ($(PLATFORM),INF_AMAZON_SE) + cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net + endif +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)apsta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)apsta.o /tftpboot +-endif +-else +- cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)sta.o /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)sta.o /tftpboot +-endif +-endif ++#else ++#ifeq ($(RT28xx_MODE),APSTA) ++# cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)apsta.o /tftpboot ++#ifeq ($(OSABL),YES) ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)apsta.o /tftpboot ++#endif ++#else ++# cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)sta.o /tftpboot ++#ifeq ($(OSABL),YES) ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)sta.o /tftpboot ++#endif ++#endif + endif + else + +@@ -402,27 +402,27 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)ap.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)ap.ko /tftpboot +-endif ++# cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)ap.ko /tftpboot ++#ifeq ($(OSABL),YES) ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)ap.ko /tftpboot ++#endif + rm -f os/linux/rt$(MODULE)ap.ko.lzma + /root/bin/lzma e os/linux/rt$(MODULE)ap.ko os/linux/rt$(MODULE)ap.ko.lzma +-else +-ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)apsta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)apsta.ko /tftpboot +-endif +-else +- cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)sta.ko /tftpboot +-ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)sta.ko /tftpboot +-endif +-endif ++#else ++#ifeq ($(RT28xx_MODE),APSTA) ++# cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)apsta.ko /tftpboot ++#ifeq ($(OSABL),YES) ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)apsta.ko /tftpboot ++#endif ++#else ++# cp -f $(RT28xx_DIR)/os/linux/rt$(MODULE)sta.ko /tftpboot ++#ifeq ($(OSABL),YES) ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(MODULE)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(MODULE)sta.ko /tftpboot ++#endif ++#endif + endif + endif + +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.4 DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.4 +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.4 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.4 2013-09-29 08:37:25.444820107 +0200 +@@ -549,13 +549,13 @@ + endif + + 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} ++ rm -rf $(DESTDIR)$(DAT_PATH) ++ $(shell [ ! -f $(DESTDIR)/etc/Wireless ] && mkdir -p $(DESTDIR)/etc/Wireless) ++ mkdir -p $(DESTDIR)$(DAT_PATH) ++ cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DESTDIR)$(DAT_PATH)/. ++ install -d $(DESTDIR)$(LINUX_SRC_MODULE) ++ install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(DESTDIR)$(LINUX_SRC_MODULE) ++# /sbin/depmod -a ${shell uname -r} + + uninstall: + # rm -rf $(DAT_PATH) +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.4.netif DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.4.netif +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.4.netif 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.4.netif 2013-09-29 08:28:23.784844428 +0200 +@@ -148,9 +148,9 @@ + endif + + install: +- install -d $(LINUX_SRC_MODULE) +- install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) +- /sbin/depmod -a ${shell uname -r} ++ install -d $(DESTDIR)$(LINUX_SRC_MODULE) ++ install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(DESTDIR)$(LINUX_SRC_MODULE) ++# /sbin/depmod -a ${shell uname -r} + + uninstall: + rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME))) +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.4.util DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.4.util +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.4.util 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.4.util 2013-09-29 08:27:06.948847878 +0200 +@@ -63,9 +63,9 @@ + endif + + install: +- install -d $(LINUX_SRC_MODULE) +- install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE) +- /sbin/depmod -a ${shell uname -r} ++ install -d $(DESTDIR)$(LINUX_SRC_MODULE) ++ install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(DESTDIR)$(LINUX_SRC_MODULE) ++# /sbin/depmod -a ${shell uname -r} + + uninstall: + rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME))) +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.6 DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.6 +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.6 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.6 2013-09-29 08:37:37.333819573 +0200 +@@ -529,13 +529,13 @@ + endif + + 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} ++ rm -rf $(DESTDIR)$(DAT_PATH) ++ $(shell [ ! -f $(DESTDIR)/etc/Wireless ] && mkdir -p $(DESTDIR)/etc/Wireless) ++ mkdir -p $(DESTDIR)$(DAT_PATH) ++ cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DESTDIR)$(DAT_PATH)/. ++ install -d $(DESTDIR)$(LINUX_SRC_MODULE) ++ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(DESTDIR)$(LINUX_SRC_MODULE) ++# /sbin/depmod -a ${shell uname -r} + + uninstall: + # rm -rf $(DAT_PATH) +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.6.netif DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.6.netif +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.6.netif 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.6.netif 2013-09-29 08:27:56.146845669 +0200 +@@ -126,9 +126,9 @@ + endif + + install: +- install -d $(LINUX_SRC_MODULE) +- install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) +- /sbin/depmod -a ${shell uname -r} ++ install -d $(DESTDIR)$(LINUX_SRC_MODULE) ++ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(DESTDIR)$(LINUX_SRC_MODULE) ++# /sbin/depmod -a ${shell uname -r} + + uninstall: + rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.6.util DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.6.util +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/Makefile.6.util 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/Makefile.6.util 2013-09-29 08:27:31.339846782 +0200 +@@ -48,9 +48,9 @@ + endif + + install: +- install -d $(LINUX_SRC_MODULE) +- install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE) +- /sbin/depmod -a ${shell uname -r} ++ install -d $(DESTDIR)$(LINUX_SRC_MODULE) ++ install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(DESTDIR)$(LINUX_SRC_MODULE) ++# /sbin/depmod -a ${shell uname -r} + + uninstall: + rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME))) +diff -urN DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/config.mk DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/config.mk +--- DPO_RT5572_LinuxSTA_2.6.1.3_20121022.orig/os/linux/config.mk 2012-10-22 05:52:59.000000000 +0200 ++++ DPO_RT5572_LinuxSTA_2.6.1.3_20121022/os/linux/config.mk 2013-09-29 11:30:32.537931142 +0200 +@@ -23,7 +23,7 @@ + + # Support Wpa_Supplicant + # i.e. wpa_supplicant -Dralink +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + + + # Support Native WpaSupplicant for Network Maganger +@@ -32,7 +32,7 @@ + # what if user want to use wpa_supplicant to serve P2P function/feature, + # in case, it must use Ralink Propriectary wpa_supplicant to do. + # and this compile flag will report P2P Related Event to Ralink wpa_supplicant. +-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 diff --git a/network/rt5370/rt5370.SlackBuild b/network/rt5370/rt5370.SlackBuild index bff2332afc..cc4b96512a 100644 --- a/network/rt5370/rt5370.SlackBuild +++ b/network/rt5370/rt5370.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for rt5370 -# Copyright 2012 Roberto Neri, Palermo, Italy +# Copyright 2012-2013 Roberto Neri, Palermo, Italy # # All rights reserved. # @@ -24,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rt5370 -VERSION=2.5.0.3 +VERSION=2.6.1.3 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} PKGVERSION=${VERSION}_$(echo $KERNEL | tr - _) -SRCNAM=2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V${VERSION}_DPO +SRCNAM=DPO_RT5572_LinuxSTA_${VERSION}_20121022 if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -51,7 +51,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM.bz2 +tar xvf $CWD/$SRCNAM.tar.bz2 cd $SRCNAM chown -R root:root . find . \ @@ -60,22 +60,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -for PATCH in \ - config.mk.diff \ - Makefile.diff \ - Makefile.4.diff \ - Makefile.4.netif.diff \ - Makefile.4.util.diff \ - Makefile.6.diff \ - Makefile.6.netif.diff \ - Makefile.6.util.diff ; do - patch -p1 < $CWD/patches/$PATCH -done +# Fix Makefiles and set 'HAS_WPA_SUPPLICANT=y' 'HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y' in os/linux/config.mk +patch -p1 < $CWD/$PRGNAM-$VERSION.patch KERNEL=$KERNEL make KERNEL=$KERNEL make install DESTDIR=$PKG mv $PKG/etc/Wireless/RT2870STA/RT2870STA.dat $PKG/etc/Wireless/RT2870STA/RT2870STA.dat.new +cp -a RT2870STACard.dat $PKG/etc/Wireless/RT2870STA/RT2870STACard.dat.sample find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/rt5370/rt5370.info b/network/rt5370/rt5370.info index a48cc8d4ed..4967f19f2a 100644 --- a/network/rt5370/rt5370.info +++ b/network/rt5370/rt5370.info @@ -1,8 +1,8 @@ PRGNAM="rt5370" -VERSION="2.5.0.3" -HOMEPAGE="http://www.ralinktech.com/en/04_support/support.php?sn=501" -DOWNLOAD="ftp://harrier.slackbuilds.org/misc/2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO.bz2" -MD5SUM="8ea0d247ac5881de1cb4c113ebf65724" +VERSION="2.6.1.3" +HOMEPAGE="http://www.mediatek.com/_en/01_products/04_pro.php?sn=1007" +DOWNLOAD="ftp://harrier.slackbuilds.org/misc/DPO_RT5572_LinuxSTA_2.6.1.3_20121022.tar.bz2" +MD5SUM="14d79bedf6567a9c5205fd118d3ad763" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/rt5370/slack-desc b/network/rt5370/slack-desc index fb40bcd247..19caf29d37 100644 --- a/network/rt5370/slack-desc +++ b/network/rt5370/slack-desc @@ -12,7 +12,7 @@ rt5370: This driver implements basic IEEE802.11 infrastructure and ad-hoc mode rt5370: with open or shared or WPA-PSK or WPA2-PSK authentication method. rt5370: NONE, WEP, TKIP and AES encryption. rt5370: -rt5370: Homepage: http://www.ralinktech.com/en/04_support/support.php?sn=501 +rt5370: Homepage: http://www.mediatek.com/_en/01_products/04_pro.php?sn=1007 rt5370: rt5370: rt5370: -- cgit v1.2.3