From 3d862afb1715c26a57543e73055ce66baa587948 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 26 Oct 2015 19:02:12 +0100 Subject: [PATCH] Update OpenWrt base --- modules | 2 +- ...0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch | 6 +++--- .../openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch | 6 +++--- ...-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2.patch | 2 +- ...k-around-unconditional-libopenssl-build-dependency.patch | 2 +- ...25-ar71xx-add-support-for-TP-LINK-TL-WR841N-ND-v10.patch | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules b/modules index cc44c940..954a349a 100644 --- a/modules +++ b/modules @@ -1,7 +1,7 @@ GLUON_FEEDS='openwrt gluon routing luci' OPENWRT_REPO=git://git.openwrt.org/15.05/openwrt.git -OPENWRT_COMMIT=22ac8d66ba960a61520c3d80a277b2b774914c19 +OPENWRT_COMMIT=f42308c3edc6bb23ce0e5ba3682195842bfbfd5c PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git PACKAGES_OPENWRT_COMMIT=ffd3b199e11ec335ce4f6ddd4a1a3aaff370318d diff --git a/patches/openwrt/0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch b/patches/openwrt/0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch index 793e08d8..20af4e8d 100644 --- a/patches/openwrt/0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch +++ b/patches/openwrt/0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch @@ -10,10 +10,10 @@ tested it on my own v5.0 router and it works. Signed-off-by: Daniel Petre diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index bb5de17..1d5f4c0 100644 +index 013a215..37ce8a4 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile -@@ -484,6 +484,14 @@ define Device/tl-wr740n-v4 +@@ -501,6 +501,14 @@ define Device/tl-wr740n-v4 CONSOLE := ttyATH0,115200 endef @@ -28,7 +28,7 @@ index bb5de17..1d5f4c0 100644 define Device/tl-wr741nd-v1 $(Device/tplink-4m) BOARDNAME := TL-WR741ND -@@ -513,7 +521,7 @@ define Device/tl-wr743nd-v2 +@@ -530,7 +538,7 @@ define Device/tl-wr743nd-v2 TPLINK_HWID := 0x07430002 CONSOLE := ttyATH0,115200 endef diff --git a/patches/openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch b/patches/openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch index 02009666..e8bf32dc 100644 --- a/patches/openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch +++ b/patches/openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch @@ -6,10 +6,10 @@ This device is identical to the TL-WR740N v5, it even uses the same HWID (which wasn't the case for older TL-WR741ND revisions). diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 1d5f4c0..0600f98 100644 +index 37ce8a4..8a25832 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile -@@ -514,6 +514,14 @@ define Device/tl-wr741nd-v4 +@@ -531,6 +531,14 @@ define Device/tl-wr741nd-v4 CONSOLE := ttyATH0,115200 endef @@ -24,7 +24,7 @@ index 1d5f4c0..0600f98 100644 define Device/tl-wr743nd-v2 $(Device/tplink-4mlzma) BOARDNAME := TL-WR741ND-v4 -@@ -521,7 +529,7 @@ define Device/tl-wr743nd-v2 +@@ -538,7 +546,7 @@ define Device/tl-wr743nd-v2 TPLINK_HWID := 0x07430002 CONSOLE := ttyATH0,115200 endef diff --git a/patches/openwrt/0015-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2.patch b/patches/openwrt/0015-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2.patch index 9c195a66..743177ea 100644 --- a/patches/openwrt/0015-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2.patch +++ b/patches/openwrt/0015-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2.patch @@ -12,7 +12,7 @@ setting LC_CTYPE=C (probably not strictly necessary on OpenWrt, but will definitely work like this, even when awk supports locales and LANG is set). diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index cacf362..e1d03ea 100755 +index 839abc7..af92b01 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -38,7 +38,7 @@ wndr3700_board_detect() { diff --git a/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch b/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch index b9eec309..77d8a05b 100644 --- a/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch +++ b/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch @@ -8,7 +8,7 @@ not only opkg-smime. Fix this by applying the same workaround as in ustream-ssl. diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile -index 32bcf2b..4da4d46 100644 +index 76688f5..3e39cf8 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -72,7 +72,7 @@ endef diff --git a/patches/openwrt/0025-ar71xx-add-support-for-TP-LINK-TL-WR841N-ND-v10.patch b/patches/openwrt/0025-ar71xx-add-support-for-TP-LINK-TL-WR841N-ND-v10.patch index dc9f579b..84f6505c 100644 --- a/patches/openwrt/0025-ar71xx-add-support-for-TP-LINK-TL-WR841N-ND-v10.patch +++ b/patches/openwrt/0025-ar71xx-add-support-for-TP-LINK-TL-WR841N-ND-v10.patch @@ -3,10 +3,10 @@ Date: Sun, 11 Oct 2015 18:00:27 +0200 Subject: ar71xx: add support for TP-LINK TL-WR841N/ND v10 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 0600f98..c9f25c1 100644 +index 8a25832..3a17420 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile -@@ -545,6 +545,13 @@ define Device/tl-wr841n-v9 +@@ -562,6 +562,13 @@ define Device/tl-wr841n-v9 TPLINK_HWID := 0x08410009 endef @@ -20,7 +20,7 @@ index 0600f98..c9f25c1 100644 define Device/tl-wr842n-v2 $(Device/tplink-8mlzma) BOARDNAME := TL-WR842N-v2 -@@ -565,7 +572,7 @@ define Device/tl-wr847n-v8 +@@ -582,7 +589,7 @@ define Device/tl-wr847n-v8 DEVICE_PROFILE := TLWR841 TPLINK_HWID := 0x08470008 endef