modules: bump OpenWrt

6bfde67581 OpenWrt v18.06.7: revert to branch defaults
1b5c116233 OpenWrt v18.06.7: adjust config defaults
ca47026b7d opkg: update to latest Git HEAD
cc0a54e332 libubox: backport security patches
ebafb746f0 lantiq: ltq-ptm: vr9: fix skb handling in ptm_hard_start_xmit()
0591348b3d tools/expat: Update to version 2.2.9
f51d1c3b7c mbedtls: update to 2.16.4
153a044c95 kernel: bump 4.14 to 4.14.167
c15a039e62 kernel: bump 4.9 to 4.9.211
02f9582e89 kirkwood: fix HDD LED labels for Zyxel NSA325 in 01_leds
04474c7d22 brcm47xx: fix switch port order for Netgear WN2500RP V1
99ab40c842 brcm47xx: fix switch port order for Netgear WNR3500 V2
3a3ca3230f ramips: fix HiWiFi HC5962 switch configuration
5c7225c26b kernel: bump 4.14 to 4.14.166
8441794f9a kernel: bump 4.14 to 4.14.165
a634830004 kernel: bump 4.9 to 4.9.210
7c42a9b6b1 kernel: bump 4.14 to 4.14.164
891bba8f77 kernel: bump 4.9 to 4.9.209
ab9d1bf608 ethtool: fix PKG_CONFIG_DEPENDS
46c2674225 OpenWrt v18.06.6: revert to branch defaults
8004e3f2c6 OpenWrt v18.06.6: adjust config defaults
d81a8a3e29 ramips: remove duplicate dts nodes of MediaTek LinkIt Smart 7688
e1b62c85f5 sunxi: Turn on CONFIG_PINCTRL_SUN4I_A10 for A20
8c6668f088 kernel: bump 4.9 to 4.9.208
455ae024d5 kernel: bump 4.14 to 4.14.162
b1eeb5dd2a ramips: fix inverted reset button for Ravpower WD03
b72b37d6ff ar71xx: really fix Mikrotik board detection
471baf3f74 ar71xx: fix Mikrotik board detection
336aaedc9c ar71xx: base-files: fix board detect on new MikroTik devices
e838957ad9 ar71xx: fix RB941-2nD detection
6b128326df kernel: bump 4.14 to 4.14.161
97e9be4e3a e2fsprogs: Fix CVE-2019-5094 in libsupport
85c4d374c2 openssl: update to version 1.0.2u

Compile-tested: none
Runtime-tested: none

(cherry picked from commit 61d460ec46)
This commit is contained in:
David Bauer 2020-01-29 22:42:32 +01:00
parent 992e72f207
commit b1216158dd
5 changed files with 11 additions and 11 deletions

View File

@ -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=83ce31d3d88429b094f3436446294a17fa7041d4
OPENWRT_COMMIT=6bfde6758188fe4a19f506edfc21ece15c4a8c77
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-18.06

View File

@ -11,16 +11,16 @@ diff --git a/tools/firmware-utils/src/mktplinkfw2.c b/tools/firmware-utils/src/m
index dead49e7af8839bac5d1dee7445cf8921208c970..35db848bbab9f8315526dfa24ed351ad58878dde 100644
--- a/tools/firmware-utils/src/mktplinkfw2.c
+++ b/tools/firmware-utils/src/mktplinkfw2.c
@@ -147,6 +147,12 @@ static struct flash_layout layouts[] = {
@@ -146,6 +146,12 @@ static struct flash_layout layouts[] = {
.kernel_la = 0x80000000,
.kernel_ep = 0x80000000,
.rootfs_ofs = 0x140000,
}, {
+ }, {
+ .id = "8MSUmtk", /* Split U-Boot OS */
+ .fw_max_len = 0x770000,
+ .kernel_la = 0x80000000,
+ .kernel_ep = 0x80000000,
+ .rootfs_ofs = 0x140000,
+ }, {
}, {
.id = "8MLmtk",
.fw_max_len = 0x7b0000,
.kernel_la = 0x80000000,

View File

@ -112,10 +112,10 @@ index 6057275978591192e3b7799a8e6d97761c3e23a5..19386b9e139a25fd1ac29cd9a66b738b
ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan2g" "phy0tpt"
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 4a58f61b925902725705a99dba8d370cfeb8b91a..c8bb6622333afaaf5b70ca4afd2ada2055d0399e 100755
index 50d3a89bd88478b6077cf4f0aacde26901f869b4..15034e8e5e461a2ca13913ecde6a789a261dad64 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -203,6 +203,7 @@ ramips_setup_interfaces()
@@ -202,6 +202,7 @@ ramips_setup_interfaces()
rt-n14u|\
tplink,c20-v4|\
tplink,c50-v3|\

View File

@ -37,10 +37,10 @@ index 19386b9e139a25fd1ac29cd9a66b738b5b092cdf..4203773b4fa3ec771f07b7a8c414a416
set_usb_led "$boardname:red:status"
;;
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index c8bb6622333afaaf5b70ca4afd2ada2055d0399e..92430fc525a0eb48decee907f614e3278aadfd8b 100755
index 15034e8e5e461a2ca13913ecde6a789a261dad64..0b65e567e558e94b5de0a53ac95dc406ccf0acec 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -304,6 +304,10 @@ ramips_setup_interfaces()
@@ -307,6 +307,10 @@ ramips_setup_interfaces()
"0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
ucidef_set_interface_wan "usb0"
;;

View File

@ -62,10 +62,10 @@ index befa032cd4c93779cf66b8b57a15e4bcba7fc959..908743c05eaac7092d3dfb117f23a934
eap120|\
eap300v2|\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index ccbd4e77c324a36e7fba6e6dccad59d8f94a3921..2200069c647b33220126e797b6a61928d1fb428e 100755
index a61c781b28177ece36e6c2a63f921d15c39b6c2a..7e96ab2b2a0b026ac063cc0f30ab8f4bbef28b1e 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -583,6 +583,10 @@ ar71xx_board_detect() {
@@ -729,6 +729,10 @@ ar71xx_board_detect() {
name="cpe210-v2"
tplink_pharos_board_detect "$(tplink_pharos_v2_get_model_string)"
;;