From 7fd60ac48a0b31042f4e936113f630ba501a8243 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 29 Apr 2016 17:54:12 +0200 Subject: [PATCH] Update OpenWrt base This also reverts commit 24d8695d8ceeb09d6c84bcd6ee4ffe087c9b386b... --- modules | 2 +- .../0014-fix-UBNT-XM-model-detection.patch | 2 +- ...HWREV-on-upgrades-of-TP-LINK-devices.patch | 4 +- ...a-space-on-some-TP-LINK-like-devices.patch | 2 +- ...XX_MODEL-to-match-labels-image-names.patch | 2 +- ...r71xx-build-image-for-TL-WR710N-v2.1.patch | 2 +- ...-ar71xx-Add-TL-WR841N-ND-v11-support.patch | 43 ------------------- targets/ar71xx-generic/profiles.mk | 16 +++---- 8 files changed, 15 insertions(+), 58 deletions(-) delete mode 100644 patches/openwrt/0031-ar71xx-Add-TL-WR841N-ND-v11-support.patch diff --git a/modules b/modules index ffccb902..8159d364 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=ba0cac08164150e74567787251e44b4d0d0dc140 +OPENWRT_COMMIT=eadf19c0b43d2f75f196ea8d875a08c7c348530c PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git PACKAGES_OPENWRT_COMMIT=9622fe984bba3a4547f48bc507ebaba7637eb2b0 diff --git a/patches/openwrt/0014-fix-UBNT-XM-model-detection.patch b/patches/openwrt/0014-fix-UBNT-XM-model-detection.patch index 79180b40..08240588 100644 --- a/patches/openwrt/0014-fix-UBNT-XM-model-detection.patch +++ b/patches/openwrt/0014-fix-UBNT-XM-model-detection.patch @@ -5,7 +5,7 @@ Subject: fix UBNT XM model detection Signed-off-by: Neal Oakey diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 5768286..7f50d8a 100755 +index dab4d2c..e7b3cd2 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -64,6 +64,40 @@ wndr3700_board_detect() { diff --git a/patches/openwrt/0021-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch b/patches/openwrt/0021-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch index 416de969..77b47675 100644 --- a/patches/openwrt/0021-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch +++ b/patches/openwrt/0021-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch @@ -10,7 +10,7 @@ Signed-off-by: Matthias Schiffer Backport of r49105 diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index 2fc1d10..420b794 100755 +index d025632..c5c1871 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -66,6 +66,10 @@ tplink_get_image_hwid() { @@ -24,7 +24,7 @@ index 2fc1d10..420b794 100755 tplink_get_image_boot_size() { get_image "$@" | dd bs=4 count=1 skip=37 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } -@@ -365,13 +369,17 @@ platform_check_image() { +@@ -366,13 +370,17 @@ platform_check_image() { } local hwid diff --git a/patches/openwrt/0022-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch b/patches/openwrt/0022-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch index 520b1d7a..70b3a004 100644 --- a/patches/openwrt/0022-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch +++ b/patches/openwrt/0022-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch @@ -11,7 +11,7 @@ Signed-off-by: Matthias Schiffer Backport of r49106 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 7f50d8a..9d650a1 100755 +index e7b3cd2..180a075 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -133,7 +133,7 @@ tplink_board_detect() { diff --git a/patches/openwrt/0023-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch b/patches/openwrt/0023-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch index e7d1ad12..9330e547 100644 --- a/patches/openwrt/0023-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch +++ b/patches/openwrt/0023-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch @@ -12,7 +12,7 @@ Signed-off-by: Matthias Schiffer Backport of r49107 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 9d650a1..52ca255 100755 +index 180a075..ddd6611 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -162,6 +162,10 @@ tplink_board_detect() { diff --git a/patches/openwrt/0024-ar71xx-build-image-for-TL-WR710N-v2.1.patch b/patches/openwrt/0024-ar71xx-build-image-for-TL-WR710N-v2.1.patch index 99e1e9ce..5a225d7d 100644 --- a/patches/openwrt/0024-ar71xx-build-image-for-TL-WR710N-v2.1.patch +++ b/patches/openwrt/0024-ar71xx-build-image-for-TL-WR710N-v2.1.patch @@ -11,7 +11,7 @@ Signed off by: Norbert Wegener Backport of r47849 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 1a399ab..9ac405c 100644 +index 9a7acbd..d42ceef 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -476,6 +476,15 @@ define Device/tl-wr710n-v2 diff --git a/patches/openwrt/0031-ar71xx-Add-TL-WR841N-ND-v11-support.patch b/patches/openwrt/0031-ar71xx-Add-TL-WR841N-ND-v11-support.patch deleted file mode 100644 index d4c406f0..00000000 --- a/patches/openwrt/0031-ar71xx-Add-TL-WR841N-ND-v11-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Matthias Schiffer -Date: Mon, 25 Apr 2016 18:07:13 +0200 -Subject: ar71xx: Add TL-WR841N/ND v11 support - -This patch adds support for the TP-Link TL-WR841N/ND to trunk. It is -similar to the already supported v10 - see [1]. I have added support -based on that topic; in the meantime it has been confirmed working -(see the forum thread, and also [2]). - -Signed-off by Stijn Segers - -[1]: https://forum.openwrt.org/viewtopic.php?id=61309 -[2]: https://forum.openwrt.org/viewtopic.php?id=63657 - -Backport of r49099 - -diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 9ac405c..1b4e6db 100644 ---- a/target/linux/ar71xx/image/Makefile -+++ b/target/linux/ar71xx/image/Makefile -@@ -578,6 +578,13 @@ define Device/tl-wr841-v10 - TPLINK_HWID := 0x08410010 - endef - -+define Device/tl-wr841-v11 -+ $(Device/tplink-4mlzma) -+ BOARDNAME := TL-WR841N-v9 -+ DEVICE_PROFILE := TLWR841 -+ TPLINK_HWID := 0x08410011 -+endef -+ - define Device/tl-wr842n-v2 - $(Device/tplink-8mlzma) - BOARDNAME := TL-WR842N-v2 -@@ -598,7 +605,7 @@ define Device/tl-wr847n-v8 - DEVICE_PROFILE := TLWR841 - TPLINK_HWID := 0x08470008 - endef --TARGET_DEVICES += tl-wr841-v8 tl-wr841-v9 tl-wr841-v10 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8 -+TARGET_DEVICES += tl-wr841-v8 tl-wr841-v9 tl-wr841-v10 tl-wr841-v11 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8 - - define Device/tl-wr941nd-v5 - $(Device/tplink-4mlzma) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index c5f76daf..1d908432 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -16,7 +16,7 @@ $(eval $(call GluonModelAlias,CPE510,tp-link-cpe510-v1.0,tp-link-cpe520-v1.1)) # TL-WA701N/ND v1, v2 $(eval $(call GluonProfile,TLWA701)) -$(eval $(call GluonModel,TLWA701,tl-wa701nd-v1,tp-link-tl-wa701n-nd-v1)) +$(eval $(call GluonModel,TLWA701,tl-wa701n-v1,tp-link-tl-wa701n-nd-v1)) $(eval $(call GluonModel,TLWA701,tl-wa701nd-v2,tp-link-tl-wa701n-nd-v2)) # TL-WA7510 v1 @@ -59,13 +59,13 @@ $(eval $(call GluonModel,TLWA801,tl-wa801nd-v2,tp-link-tl-wa801n-nd-v2)) # TL-WR841N/ND v3, v5, v7, v8, v9, v10, v11 $(eval $(call GluonProfile,TLWR841)) -$(eval $(call GluonModel,TLWR841,tl-wr841-v3,tp-link-tl-wr841n-nd-v3)) -$(eval $(call GluonModel,TLWR841,tl-wr841-v5,tp-link-tl-wr841n-nd-v5)) -$(eval $(call GluonModel,TLWR841,tl-wr841-v7,tp-link-tl-wr841n-nd-v7)) -$(eval $(call GluonModel,TLWR841,tl-wr841-v8,tp-link-tl-wr841n-nd-v8)) -$(eval $(call GluonModel,TLWR841,tl-wr841-v9,tp-link-tl-wr841n-nd-v9)) -$(eval $(call GluonModel,TLWR841,tl-wr841-v10,tp-link-tl-wr841n-nd-v10)) -$(eval $(call GluonModel,TLWR841,tl-wr841-v11,tp-link-tl-wr841n-nd-v11)) +$(eval $(call GluonModel,TLWR841,tl-wr841nd-v3,tp-link-tl-wr841n-nd-v3)) +$(eval $(call GluonModel,TLWR841,tl-wr841nd-v5,tp-link-tl-wr841n-nd-v5)) +$(eval $(call GluonModel,TLWR841,tl-wr841nd-v7,tp-link-tl-wr841n-nd-v7)) +$(eval $(call GluonModel,TLWR841,tl-wr841n-v8,tp-link-tl-wr841n-nd-v8)) +$(eval $(call GluonModel,TLWR841,tl-wr841n-v9,tp-link-tl-wr841n-nd-v9)) +$(eval $(call GluonModel,TLWR841,tl-wr841n-v10,tp-link-tl-wr841n-nd-v10)) +$(eval $(call GluonModel,TLWR841,tl-wr841n-v11,tp-link-tl-wr841n-nd-v11)) # TL-WR842N/ND v1, v2 $(eval $(call GluonProfile,TLWR842))