From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 2 Jul 2019 11:16:08 +0000 (+0200)
Subject: base-files: drop unused jffs2_copy_config()
X-Git-Tag: v1.5.0-rc2~126
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=12c2ea6bded4dd52696e0e0a6d5621984c5732ab;p=librecmc%2Flibrecmc.git

base-files: drop unused jffs2_copy_config()

Its last usage was dropped back in 2013 in the commit b95bdc8ab56e
("kernel/base-files: clean up old code related to refreshing mtd
partitions, it is no longer used anywhere").

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit f58ca6ee57b77350c69639defdceacb2e77e2249)
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c84d2763c2..f32c2b440f 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:=201
+PKG_RELEASE:=202
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index bbedeefd26..0f6fab97f8 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -207,16 +207,6 @@ get_partitions() { # <device> <filename>
 	fi
 }
 
-jffs2_copy_config() {
-	if grep rootfs_data /proc/mtd >/dev/null; then
-		# squashfs+jffs2
-		mtd -e rootfs_data jffs2write "$CONF_TAR" rootfs_data
-	else
-		# jffs2
-		mtd jffs2write "$CONF_TAR" rootfs
-	fi
-}
-
 indicate_upgrade() {
 	. /etc/diag.sh
 	set_state upgrade