[OpenWrt-Devel,2/2] base-files: drop support for the platform_nand_pre_upgrade()
diff mbox series

Message ID 20190717093255.26245-2-zajec5@gmail.com
State Accepted
Delegated to: Rafał Miłecki
Headers show
Series
  • [OpenWrt-Devel,1/2] treewide: sysupgrade: get rid of platform_nand_pre_upgrade()
Related show

Commit Message

Rafał Miłecki July 17, 2019, 9:32 a.m. UTC
From: Rafał Miłecki <rafal@milecki.pl>

No target uses it anymore. All code from that callback was moved into
the platform_do_upgrade().

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 package/base-files/Makefile                  | 2 +-
 package/base-files/files/lib/upgrade/nand.sh | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

Patch
diff mbox series

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7c63d3ef44..49254a3680 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@  include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=204
+PKG_RELEASE:=205
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
index 9f258a82c5..fbc2b5c19a 100644
--- a/package/base-files/files/lib/upgrade/nand.sh
+++ b/package/base-files/files/lib/upgrade/nand.sh
@@ -282,10 +282,6 @@  nand_upgrade_tar() {
 nand_do_upgrade() {
 	local file_type=$(identify $1)
 
-	if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then
-		platform_nand_pre_upgrade "$1"
-	fi
-
 	[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
 
 	case "$file_type" in