From: John Crispin <john@openwrt.org>
Date: Wed, 11 Jun 2014 12:59:45 +0000 (+0000)
Subject: fstools: the ubi flash tool is obselete now
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3417834ffcf84d40d9b96cde8c41d0511665d0b1;p=openwrt%2Fstaging%2Flinusw.git

fstools: the ubi flash tool is obselete now

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41128
---

diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index b10f105a74..08b3be478f 100644
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -32,16 +32,10 @@ TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
 define Package/fstools
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+ubox +USE_EGLIBC:librt
+  DEPENDS:=+ubox +USE_EGLIBC:librt +NAND_SUPPORT:ubi-utils
   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
@@ -58,12 +52,6 @@ define Package/fstools/install
 	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)/lib $(1)/usr/sbin $(1)/etc/hotplug.d/block $(1)/etc/init.d/ $(1)/etc/uci-defaults/
 
@@ -86,5 +74,4 @@ define Build/InstallDev
 endef
 
 $(eval $(call BuildPackage,fstools))
-$(eval $(call BuildPackage,ubi-flash))
 $(eval $(call BuildPackage,block-mount))