hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

base-files: drop support for NAND upgrade in platform_pre_upgrade() 

With bcm53xx switched to the new procedure there is no more need for
keeping that backward compatibility code.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit ea4e1dac71)
openwrt-19.07
Rafał Miłecki 2019-07-02 16:10:57 +02:00 committed by Jo-Philipp Wich
parent e98eab1b6b
commit a074ed2933
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
include $(INCLUDE_DIR)/feeds.mk include $(INCLUDE_DIR)/feeds.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=202 PKG_RELEASE:=203
PKG_FLAGS:=nonshared PKG_FLAGS:=nonshared
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

4
package/base-files/files/lib/upgrade/common.sh
View File

@ -228,9 +228,7 @@ default_do_upgrade() {
do_upgrade_stage2() { do_upgrade_stage2() {
v "Performing system upgrade..." v "Performing system upgrade..."
if [ -n "$do_upgrade" ]; then if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
eval "$do_upgrade"
elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
platform_do_upgrade "$IMAGE" platform_do_upgrade "$IMAGE"
else else
default_do_upgrade "$IMAGE" default_do_upgrade "$IMAGE"

9
package/base-files/files/lib/upgrade/nand.sh
View File

@ -280,15 +280,6 @@ nand_upgrade_tar() {
# Recognize type of passed file and start the upgrade process # Recognize type of passed file and start the upgrade process
nand_do_upgrade() { nand_do_upgrade() {
if [ -n "$IS_PRE_UPGRADE" ]; then
# Previously, nand_do_upgrade was called from the platform_pre_upgrade
# hook; this piece of code handles scripts that haven't been
# updated. All scripts should gradually move to call nand_do_upgrade
# from platform_do_upgrade instead.
export do_upgrade="nand_do_upgrade '$1'"
return
fi
local file_type=$(identify $1) local file_type=$(identify $1)
if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then

5
package/base-files/files/lib/upgrade/stage2
View File

@ -136,10 +136,7 @@ sleep 1
if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
IS_PRE_UPGRADE=1 platform_pre_upgrade "$IMAGE" platform_pre_upgrade "$IMAGE"
# Needs to be unset again because of busybox weirdness ...
IS_PRE_UPGRADE=
fi fi
if [ -n "$(rootfs_type)" ]; then if [ -n "$(rootfs_type)" ]; then