From 01a5a791296723baad419350501eb84ad05f1ef9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <martin@darmstadt.freifunk.net>
Date: Fri, 14 Dec 2018 01:18:15 +0100
Subject: [PATCH] modules: update OpenWrt

6f74e269c8 kernel: bump 4.14 to 4.14.87
b2f243394e kernel: bump 4.9 to 4.9.144
2213b20aee kernel: bump 4.14 to 4.14.86
bcd7644007 kernel: bump 4.9 to 4.9.143
d5afaa4114 openvpn: re-add option comp_lzo
629073e86d rpcd: update to latest Git head
1cd945ea22 ramips: fix leds on GL.iNet GL-MT300N-V2
fbadfecbb5 ipq40xx: fix openmesh sysupgrade with tar content out of order
06a20afb34 rules.mk: fix syntax error
d40e90986c rules.mk: add INSTALL_SUID macro
d40de11d1b base-files: fix prerm return value, align with postinst code
cc8e875039 sdk: find kernel modules when KDIR is a symlink
a8b292afe6 uhttpd: update to latest Git head
7a8b75375c uhttpd: support multiple Lua prefixes
fede6df09e uhttpd: update to latest Git head
9671a2d2c8 apm821xx: MBL: load kernel/dtb from SATA 0:1 first
26ebcc88e3 apm821xx: wndr4700: restore sd-card media detection
5337319bdf uclient: update to latest Git head

Compile-tested: ar71xx, ipq40xx, x86-64
Runtime-tested: ar71xx
---
 modules                                       |  2 +-
 ...ath10k-ct-reduce-memory-consumption.patch} |  0
 ...ips-fix-leds-on-GL.iNet-GL-MT300N-V2.patch | 34 -------------------
 ...x-add-support-for-UniFi-AC-Mesh-Pro.patch} |  0
 4 files changed, 1 insertion(+), 35 deletions(-)
 rename patches/openwrt/{0012-ath10k-ct-reduce-memory-consumption.patch => 0011-ath10k-ct-reduce-memory-consumption.patch} (100%)
 delete mode 100644 patches/openwrt/0011-ramips-fix-leds-on-GL.iNet-GL-MT300N-V2.patch
 rename patches/openwrt/{0013-ar71xx-add-support-for-UniFi-AC-Mesh-Pro.patch => 0012-ar71xx-add-support-for-UniFi-AC-Mesh-Pro.patch} (100%)

diff --git a/modules b/modules
index e44f5244f..28be58437 100644
--- a/modules
+++ b/modules
@@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing luci gluon'
 
 OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-18.06
-OPENWRT_COMMIT=a02d9a7d9fc8d005b27351509f02d3970e21972e
+OPENWRT_COMMIT=6f74e269c86c7aaec44edb5de0e122bebf54c71f
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-18.06
diff --git a/patches/openwrt/0012-ath10k-ct-reduce-memory-consumption.patch b/patches/openwrt/0011-ath10k-ct-reduce-memory-consumption.patch
similarity index 100%
rename from patches/openwrt/0012-ath10k-ct-reduce-memory-consumption.patch
rename to patches/openwrt/0011-ath10k-ct-reduce-memory-consumption.patch
diff --git a/patches/openwrt/0011-ramips-fix-leds-on-GL.iNet-GL-MT300N-V2.patch b/patches/openwrt/0011-ramips-fix-leds-on-GL.iNet-GL-MT300N-V2.patch
deleted file mode 100644
index 89c2b60ae..000000000
--- a/patches/openwrt/0011-ramips-fix-leds-on-GL.iNet-GL-MT300N-V2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Martin Weinelt <hexa@darmstadt.ccc.de>
-Date: Fri, 2 Nov 2018 20:52:01 +0100
-Subject: ramips: fix leds on GL.iNet GL-MT300N-V2
-
-The WAN LED now shows the link state. It's color is green,
-not blue.
-
-Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
-
-diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
-index 54504c6ee8bb45db0ffa371ec68c3a8fd7e4d673..6057275978591192e3b7799a8e6d97761c3e23a5 100755
---- a/target/linux/ramips/base-files/etc/board.d/01_leds
-+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
-@@ -210,6 +210,7 @@ gl-mt750)
- 	;;
- gl-mt300n-v2)
- 	set_wifi_led "$boardname:red:wlan"
-+	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x1"
- 	;;
- hc5661|\
- hc5661a)
-diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts
-index e99d5578f05bbaf82917878b87eb973a8323198c..98c9a796330068b36df5946f4a428e1b324594f8 100644
---- a/target/linux/ramips/dts/GL-MT300N-V2.dts
-+++ b/target/linux/ramips/dts/GL-MT300N-V2.dts
-@@ -28,7 +28,7 @@
- 		};
- 
- 		wan {
--			label = "gl-mt300n-v2:blue:wan";
-+			label = "gl-mt300n-v2:green:wan";
- 			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
- 		};
- 
diff --git a/patches/openwrt/0013-ar71xx-add-support-for-UniFi-AC-Mesh-Pro.patch b/patches/openwrt/0012-ar71xx-add-support-for-UniFi-AC-Mesh-Pro.patch
similarity index 100%
rename from patches/openwrt/0013-ar71xx-add-support-for-UniFi-AC-Mesh-Pro.patch
rename to patches/openwrt/0012-ar71xx-add-support-for-UniFi-AC-Mesh-Pro.patch
-- 
GitLab