From 43562719f08fc80a1596da0af297345a754e025d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 7 Apr 2014 15:10:07 +0000 Subject: [PATCH] fstools: update to latest git HEAD this adds the /sbin/ubi tool that can be used for sysupgrading ubi volumes Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40415 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/system/fstools/Makefile | 27 +++++++++++++++++++------ package/system/fstools/files/jffs2mark | 3 --- package/system/fstools/files/jffs2reset | 3 --- package/system/fstools/files/mount_root | 3 --- package/system/fstools/files/snapshot | 12 +++++------ 5 files changed, 27 insertions(+), 21 deletions(-) delete mode 100644 package/system/fstools/files/jffs2mark delete mode 100644 package/system/fstools/files/jffs2reset delete mode 100644 package/system/fstools/files/mount_root diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index f7e37bc919..9672ee1da5 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fstools -PKG_VERSION:=2014-04-01 +PKG_VERSION:=2014-04-07 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/fstools.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=4e3268f90ae97ccb047c47a78b83bcebeb9593cd +PKG_SOURCE_VERSION:=a1f48fc0444f5c3c44ee6ef1005cd8da65decefd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 @@ -29,6 +29,12 @@ define Package/fstools TITLE:=OpenWrt filesystem tools endef +define Package/ubi-flash + SECTION:=base + CATEGORY:=Base system + TITLE:=OpenWrt ubi flashing tool +endef + define Package/block-mount SECTION:=base CATEGORY:=Base system @@ -37,25 +43,34 @@ define Package/block-mount endef define Package/fstools/install - $(INSTALL_DIR) $(1)/sbin + $(INSTALL_DIR) $(1)/sbin $(1)/lib - $(INSTALL_BIN) ./files/{jffs2reset,jffs2mark,mount_root} $(1)/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fs-state $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset,snapshot_tool} $(1)/sbin/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libfstools.so $(1)/lib/ $(INSTALL_BIN) ./files/snapshot $(1)/sbin/ + ln -s /sbin/jffs2reset $(1)/sbin/jffs2mark +endef + +define Package/ubi-flash/install + $(INSTALL_DIR) $(1)/sbin $(1)/lib + + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ubi $(1)/sbin/ endef define Package/block-mount/install - $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/etc/hotplug.d/block $(1)/etc/init.d/ $(1)/etc/uci-defaults/ + $(INSTALL_DIR) $(1)/sbin $(1)/lib $(1)/usr/sbin $(1)/etc/hotplug.d/block $(1)/etc/init.d/ $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab $(INSTALL_DATA) ./files/fstab.default $(1)/etc/uci-defaults/10-fstab $(INSTALL_DATA) ./files/mount.hotplug $(1)/etc/hotplug.d/block/10-mount $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblkid-tiny.so $(1)/lib/ ln -s /sbin/block $(1)/usr/sbin/swapon ln -s /sbin/block $(1)/usr/sbin/swapoff endef $(eval $(call BuildPackage,fstools)) +$(eval $(call BuildPackage,ubi-flash)) $(eval $(call BuildPackage,block-mount)) diff --git a/package/system/fstools/files/jffs2mark b/package/system/fstools/files/jffs2mark deleted file mode 100644 index 3f5a5328fc..0000000000 --- a/package/system/fstools/files/jffs2mark +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -fs-state overlay jffs2mark $@ diff --git a/package/system/fstools/files/jffs2reset b/package/system/fstools/files/jffs2reset deleted file mode 100644 index 9cdcc7847c..0000000000 --- a/package/system/fstools/files/jffs2reset +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -fs-state overlay jffs2reset $@ diff --git a/package/system/fstools/files/mount_root b/package/system/fstools/files/mount_root deleted file mode 100644 index 860c194ce3..0000000000 --- a/package/system/fstools/files/mount_root +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -fs-state start diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot index 85a0076d8e..1450e12458 100644 --- a/package/system/fstools/files/snapshot +++ b/package/system/fstools/files/snapshot @@ -6,7 +6,7 @@ do_snapshot_unpack() { echo "- snapshot -" mkdir /tmp/snapshot cd /tmp/snapshot - fs-state snapshot read + snapshot_tool read block=`ls block*.tar.gz 2> /dev/null` [ -z "$block" ] || for a in $block; do tar xzf $a -C / @@ -16,7 +16,7 @@ do_snapshot_unpack() { do_config_unpack() { echo "- config -" - fs-state snapshot config_read + snapshot_tool config_read [ -f /tmp/config.tar.gz ] && { tar xzf /tmp/config.tar.gz -C / rm -f /tmp/config.tar.gz @@ -26,14 +26,14 @@ do_config_unpack() { do_snapshot_push() { cd /volatile tar czf /tmp/snapshot.tar.gz * - fs-state snapshot write + snapshot_tool write reboot } do_config_push() { cd /volatile tar czf /tmp/config.tar.gz * - fs-state snapshot config_write + snapshot_tool config_write } do_snapshot_upgrade() { @@ -56,7 +56,7 @@ do_snapshot_upgrade() { } do_convert_jffs2() { - fs-state snapshot write + snapshot_tool write sleep 2 reboot -f } @@ -94,7 +94,7 @@ upgrade) do_snapshot_upgrade ;; info) - fs-state info + snapshot_tool info ;; esac }