diff --git a/modules b/modules index 4c8164af..aef7d93b 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=2e26bdfeca2ffe381eb17fa9765724be7d45e1d8 +LEDE_COMMIT=788312ca59c57f1cfc4737378526ff1c2a1c8374 PACKAGES_OPENWRT_REPO=https://github.com/openwrt/packages.git PACKAGES_OPENWRT_BRANCH=lede-17.01 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 64bccb3f..f2e02ebb 100644 --- a/patches/lede/0015-base-files-always-use-staged-sysupgrade.patch +++ b/patches/lede/0015-base-files-always-use-staged-sysupgrade.patch @@ -12,7 +12,7 @@ are killed to allow unmounting the root filesystem. Signed-off-by: Matthias Schiffer diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh -index 3ddd1e74657e0f9893533f917cb56ed0c2e3196c..6f8e408401906666db945a981100962139fc7d32 100644 +index 8c1b3b180e1ecfdd2c106dd3b8853cd487ff89b4..ef9aac709fc1619ba15eeb0aeb4a9a6a372369b2 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -56,7 +56,6 @@ run_ramfs() { # [...] @@ -147,7 +147,7 @@ index 3ddd1e74657e0f9893533f917cb56ed0c2e3196c..6f8e408401906666db945a9811009621 } get_magic_word() { -@@ -328,12 +316,14 @@ default_do_upgrade() { +@@ -331,12 +319,14 @@ default_do_upgrade() { fi } @@ -166,7 +166,7 @@ index 3ddd1e74657e0f9893533f917cb56ed0c2e3196c..6f8e408401906666db945a9811009621 fi if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then -@@ -341,12 +331,11 @@ do_upgrade() { +@@ -344,12 +334,11 @@ do_upgrade() { fi v "Upgrade completed" diff --git a/patches/lede/0018-base-files-sysupgrade-cleanup.patch b/patches/lede/0018-base-files-sysupgrade-cleanup.patch index 36837469..b04cd219 100644 --- a/patches/lede/0018-base-files-sysupgrade-cleanup.patch +++ b/patches/lede/0018-base-files-sysupgrade-cleanup.patch @@ -13,7 +13,7 @@ fixed eventually to use platform_do_upgrade for that purpose. Signed-off-by: Matthias Schiffer diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh -index 6f8e408401906666db945a981100962139fc7d32..b18463f6b8e81d871b27146c00d061941ac6a2ec 100644 +index ef9aac709fc1619ba15eeb0aeb4a9a6a372369b2..af7682c29e005c6ca47b91e9be2d60c359a90d05 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -30,106 +30,6 @@ install_bin() { # [ ... ] diff --git a/patches/lede/0030-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch b/patches/lede/0030-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch index 69f8d544..82de1177 100644 --- a/patches/lede/0030-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch +++ b/patches/lede/0030-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch @@ -6,10 +6,10 @@ Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade" Signed-off-by: Matthias Schiffer diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh -index b18463f6b8e81d871b27146c00d061941ac6a2ec..f0443f8c495dc0c14a52e8b88b20a22c7620291b 100644 +index af7682c29e005c6ca47b91e9be2d60c359a90d05..6ccd84c5a95348124412adc8bf41d3fa4894435a 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh -@@ -219,7 +219,7 @@ default_do_upgrade() { +@@ -222,7 +222,7 @@ default_do_upgrade() { do_upgrade_stage2() { v "Performing system upgrade..." if [ -n "$do_upgrade" ]; then