fstools: fix extroot with opkg-installed block-mount (#15550)

[openwrt.git] / package / system / fstools / Makefile

diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index f7e37bc919fa51363e12ed373410f1129d7fe05d..826f77d060f46916da8af2d8e3660cf3ca43786f 100644 (file)
--- 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-17
 
 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:=fe222812cc12d37647fbb8667851eb005ea95331
 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))