X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fsystem%2Ffstools%2FMakefile;h=13978f7a03a4bed694a90576bdd153c080661c7b;hb=c10d97484a43375a0446dafc8cb4072e26502f37;hp=40adf0af5725b60ecad8e0812178b0305e7053ee;hpb=118eec12e850fb43075ea6a9cf8765cfd5ff157d;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index 40adf0af57..13978f7a03 100644
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -8,20 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fstools
-PKG_VERSION:=2014-06-02
+PKG_VERSION:=2014-10-27
 
 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:=d04e58946eff771bf59db90d7a2301b746141ac4
+PKG_SOURCE_VERSION:=d71297353dc45eaf8f7c252246490746708530f9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
+PKG_CHECK_FORMAT_SECURITY:=0
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 
+PKG_USE_MIPS16:=0
+
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
@@ -32,16 +35,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 +55,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/
 
@@ -78,6 +69,12 @@ define Package/block-mount/install
 
 endef
 
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libubi-utils.a $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,fstools))
-$(eval $(call BuildPackage,ubi-flash))
 $(eval $(call BuildPackage,block-mount))