From ebef2c27eb8a2840ae64ff51785a61f9752e59b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 2 Jul 2019 13:16:08 +0200 Subject: [PATCH] base-files: drop unused jffs2_copy_config() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit f58ca6ee57b77350c69639defdceacb2e77e2249) --- package/base-files/Makefile | 2 +- package/base-files/files/lib/upgrade/common.sh | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e2794f9ced..551ef71be5 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() { # 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