fstools: update to latest HEAD

Rename jffs2reset to factoryreset. Convert all scripts to using the new command
line. Print a deprecation notice when jffs2reset is invoked.

49d36ba jffs2reset: rename to factoryreset
b135064 jffs2reset: print deprecation message

Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
index 2403122ad21d1abd568337908c9d58060e87bf08..84651334710dce09b6a9c342d4b871c64516204d 100755 (executable)
--- a/package/base-files/files/etc/rc.button/reset
+++ b/package/base-files/files/etc/rc.button/reset
@@ -23,7 +23,7 @@ released)
        elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ]
        then
                echo "FACTORY RESET" > /dev/console
-               jffs2reset -y && reboot &
+               factoryreset -y && reboot &
        fi
 ;;
 esac

diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index d9af57d59645bc44a5c8d789159eb7ea8b488c8d..3dd6f1e7d246767b14fa9f458ee169f0f521900a 100755 (executable)
--- a/package/base-files/files/sbin/firstboot
+++ b/package/base-files/files/sbin/firstboot
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/sbin/jffs2reset $@
+/sbin/factoryreset $@

diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index 419cdfff9aea2c962f17ec72609f278dc33e3b2a..2f30915bf985255eb91fbaa731b781e74dcea914 100644 (file)
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
-PKG_MIRROR_HASH:=5f04ce2b346d9a48468180dd9601ca0fcc83896ebf5466855578e766646e14a1
-PKG_SOURCE_DATE:=2024-07-14
-PKG_SOURCE_VERSION:=408c2cc48e6694446c89da7f8121b399063e1067
+PKG_MIRROR_HASH:=b0de38a758cccdb234d909eda3bf4de40d260f75000f27d30e7d1bc4158b1094
+PKG_SOURCE_DATE:=2024-12-02
+PKG_SOURCE_VERSION:=49d36ba2d1ada4ca177612cfbe904beb286dcab7
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -95,9 +95,10 @@ endef
 define Package/fstools/install
        $(INSTALL_DIR) $(1)/sbin $(1)/lib
 
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset} $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,factoryreset} $(1)/sbin/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libfstools.so $(1)/lib/
-       $(LN) jffs2reset $(1)/sbin/jffs2mark
+       $(LN) factoryreset $(1)/sbin/jffs2mark
+       $(LN) factoryreset $(1)/sbin/jffs2reset
 endef
 
 define Package/snapshot-tool/install