diff --git a/modules b/modules index 0bd1a8e3e7f7609818a432db80c1d1e71a8f5bbe..8f7b3e3c921d8edc3cc170191269c61a46c74fbc 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='openwrt gluon routing luci' LEDE_REPO=https://git.lede-project.org/openwrt/openwrt.git LEDE_BRANCH=lede-17.01 -LEDE_COMMIT=01d7a5d7dee247c40a7ecfbd7ba221640752e76f +LEDE_COMMIT=9b0a4bafbce7db0133cb69a2f73c9312f4ff1df7 PACKAGES_OPENWRT_REPO=https://github.com/openwrt/packages.git PACKAGES_OPENWRT_BRANCH=lede-17.01 diff --git a/patches/lede/0003-base-files-disable-reset-button-handling.patch b/patches/lede/0003-base-files-disable-reset-button-handling.patch index 7e44f2903f026b15951a90a787e3e9d865e3c764..55d95fde313a3a3821a700e760be35c187feb28a 100644 --- a/patches/lede/0003-base-files-disable-reset-button-handling.patch +++ b/patches/lede/0003-base-files-disable-reset-button-handling.patch @@ -6,7 +6,7 @@ This conflicts with our reset button usage. diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset deleted file mode 100755 -index 4265767437e8eda3c758fe7f7941d7f608c95782..0000000000000000000000000000000000000000 +index 2403122ad21d1abd568337908c9d58060e87bf08..0000000000000000000000000000000000000000 --- a/package/base-files/files/etc/rc.button/reset +++ /dev/null @@ -1,31 +0,0 @@ @@ -32,7 +32,7 @@ index 4265767437e8eda3c758fe7f7941d7f608c95782..00000000000000000000000000000000 - echo "REBOOT" > /dev/console - sync - reboot -- elif [ "$SEEN" -gt 5 -a -n "$OVERLAY" ] +- elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ] - then - echo "FACTORY RESET" > /dev/console - jffs2reset -y && reboot & diff --git a/patches/lede/0014-procd-remove-procd-nand-package.patch b/patches/lede/0014-procd-remove-procd-nand-package.patch index 196af33659e19fae63943e2e8c03c8125a38b499..a8923e92029332e934bd42924ba9c0fa57d52932 100644 --- a/patches/lede/0014-procd-remove-procd-nand-package.patch +++ b/patches/lede/0014-procd-remove-procd-nand-package.patch @@ -12,7 +12,7 @@ as a separate package. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> diff --git a/package/base-files/Makefile b/package/base-files/Makefile -index 3fcf20a84433eb1a41e970cd010cc414bb180fad..0813f2ae76e2a6b83b5d077b61010d13c1a50fee 100644 +index 40963d5bd4a7fce5834c4cd6aa6d5454662c063e..685e3c4061528e2b28054cce53258889b48c05b2 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -19,7 +19,9 @@ PKG_BUILD_DEPENDS:=usign/host diff --git a/patches/lede/0015-base-files-always-use-staged-sysupgrade.patch b/patches/lede/0015-base-files-always-use-staged-sysupgrade.patch index f2e02ebb1d1c1dff34609dbd1c2cb631971b8337..003e74b929d5308a9a78be2a97324db44cec2b5c 100644 --- a/patches/lede/0015-base-files-always-use-staged-sysupgrade.patch +++ b/patches/lede/0015-base-files-always-use-staged-sysupgrade.patch @@ -325,7 +325,7 @@ index 0000000000000000000000000000000000000000..4e2aa3a23c3bab07a795762a30a4d4f7 + exec /bin/busybox ash -c "$COMMAND" +fi diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade -index c095ca81c50c71021af2dc04a561ac22f6b7442b..2d67371ef74b4b970076a069e97f4fd6a1e0bc95 100755 +index 71c7faa6dbc485ff33e776ff087e1aca58cfb0b0..fa08f4194daa0ee74758b9f49a23fe8dcb4b933d 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -1,4 +1,7 @@ @@ -374,7 +374,7 @@ index c095ca81c50c71021af2dc04a561ac22f6b7442b..2d67371ef74b4b970076a069e97f4fd6 cat <<-EOF -b|--create-backup and -r|--restore-backup do not perform a firmware upgrade. Do not specify both -b|-r and a firmware image. -@@ -136,14 +136,13 @@ sysupgrade_pre_upgrade="fwtool_pre_upgrade" +@@ -155,14 +155,13 @@ sysupgrade_pre_upgrade="fwtool_pre_upgrade" include /lib/upgrade @@ -390,7 +390,7 @@ index c095ca81c50c71021af2dc04a561ac22f6b7442b..2d67371ef74b4b970076a069e97f4fd6 return 0 } run_hooks "$CONFFILES" $sysupgrade_init_conffiles -@@ -184,8 +183,33 @@ type platform_check_image >/dev/null 2>/dev/null || { +@@ -203,8 +202,33 @@ type platform_check_image >/dev/null 2>/dev/null || { exit 1 } @@ -425,7 +425,7 @@ index c095ca81c50c71021af2dc04a561ac22f6b7442b..2d67371ef74b4b970076a069e97f4fd6 if [ $FORCE -eq 1 ]; then echo "Image check '$check' failed but --force given - will update anyway!" break -@@ -211,6 +235,7 @@ elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then +@@ -230,6 +254,7 @@ elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then [ $TEST -eq 1 ] || do_save_conffiles export SAVE_CONFIG=1 else @@ -433,7 +433,7 @@ index c095ca81c50c71021af2dc04a561ac22f6b7442b..2d67371ef74b4b970076a069e97f4fd6 export SAVE_CONFIG=0 fi -@@ -218,28 +243,18 @@ if [ $TEST -eq 1 ]; then +@@ -237,28 +262,18 @@ if [ $TEST -eq 1 ]; then exit 0 fi diff --git a/patches/lede/0018-base-files-sysupgrade-cleanup.patch b/patches/lede/0018-base-files-sysupgrade-cleanup.patch index b04cd21918f66f7a62a0d9e3ac0ca23cde7e2235..61ba17178c069a7d406552cd02822e684c8ce19c 100644 --- a/patches/lede/0018-base-files-sysupgrade-cleanup.patch +++ b/patches/lede/0018-base-files-sysupgrade-cleanup.patch @@ -245,7 +245,7 @@ index 4e2aa3a23c3bab07a795762a30a4d4f701081934..cc8047d988e39ca9ba27d2588744aad4 +# Exec new shell from ramfs +exec /bin/busybox ash -c "$COMMAND" diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade -index 2d67371ef74b4b970076a069e97f4fd6a1e0bc95..200a0e520b5df8bcc208f4d8fd731756e94294fb 100755 +index fa08f4194daa0ee74758b9f49a23fe8dcb4b933d..347860d00af27a61152703320bb210d30726db83 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -1,7 +1,5 @@ diff --git a/patches/lede/0019-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch b/patches/lede/0019-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch index 5b5dceae7e9c06d571964a6c1b74dc34e95c489a..688a30d9a5b54e0181bef86d502e06b70b077e0b 100644 --- a/patches/lede/0019-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch +++ b/patches/lede/0019-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch @@ -45,10 +45,10 @@ index 3147cdc5a68a69cef6b1af6618a4e2367a143c2c..728c63b2e8aebf970cd7dff0d15518cc boot_hook_add failsafe failsafe_netlogin diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade -index 200a0e520b5df8bcc208f4d8fd731756e94294fb..809e789f9f436aaeb47a906d46c94d5952583e5a 100755 +index 347860d00af27a61152703320bb210d30726db83..4a133a65e0960619b9cd0d722b6c27ac7894de5b 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade -@@ -251,8 +251,16 @@ run_hooks "" $sysupgrade_pre_upgrade +@@ -270,8 +270,16 @@ run_hooks "" $sysupgrade_pre_upgrade install_bin /sbin/upgraded v "Commencing upgrade. All shell sessions will be closed now." diff --git a/patches/lede/0060-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch b/patches/lede/0060-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch index 6f67670c13f87cbc323186d56516f8efac110326..0c2e6c1345366805d9e1418ba7bf2dcc2264ac06 100644 --- a/patches/lede/0060-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch +++ b/patches/lede/0060-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch @@ -5,7 +5,7 @@ Subject: ar71xx: add unaligned access hacks for VXLAN Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch -index 9a440b45059b4af9a974cd82f4686ea5c6f3e265..37841c035cd8b0b893b27e9f1fad6e0b02f4af6f 100644 +index 72d964df639ba2a91071fbdc893bf500ece51a48..19b1d6fc7fc8af37515fe4b5f188e856441a2436 100644 --- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch @@ -929,3 +929,119 @@