fstools: update to the latest version

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

diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index 054be0f43f571a9f406e0a619ae9c7ebe11df6c7..0f73dd27d3522c6114e3a34f6e16fa67a43e27a3 100644 (file)
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -8,35 +8,36 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fstools
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fstools

-PKG_VERSION:=2015-03-12
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1

 
 PKG_SOURCE_PROTO:=git
 
 PKG_SOURCE_PROTO:=git

-PKG_SOURCE_URL:=git://nbd.name/fstools.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=0b99adb02f2eb822fbfc4efcb8ebf5fecbd74974
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL=$(LEDE_GIT)/project/fstools.git
+PKG_SOURCE_DATE:=2017-02-11
+PKG_SOURCE_VERSION:=7d78836dac9e0ece57c51ab06589efa524276b9d
+PKG_MIRROR_HASH:=261d8e6d0faa18b3c87cd6089b9110d655da133e478033e454c749ac43d3bc15

 CMAKE_INSTALL:=1
 CMAKE_INSTALL:=1

-PKG_CHECK_FORMAT_SECURITY:=0

 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
 PKG_USE_MIPS16:=0

+PKG_FLAGS:=nonshared
+
+PKG_BUILD_DEPENDS := util-linux
+PKG_CONFIG_DEPENDS := CONFIG_NAND_SUPPORT CONFIG_FSTOOLS_UBIFS_EXTROOT

 
 

-PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_MAINTAINER:=John Crispin <john@phrozen.org>

 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 

-TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
+TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)

 CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y)
 
 define Package/fstools
   SECTION:=base
   CATEGORY:=Base system
 CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y)
 
 define Package/fstools
   SECTION:=base
   CATEGORY:=Base system

-  DEPENDS:=+ubox +USE_EGLIBC:librt +NAND_SUPPORT:ubi-utils
+  DEPENDS:=+ubox +USE_GLIBC:librt +NAND_SUPPORT:ubi-utils

   TITLE:=OpenWrt filesystem tools
   MENU:=1
 endef
   TITLE:=OpenWrt filesystem tools
   MENU:=1
 endef


@@ -51,6 +52,13 @@ define Package/fstools/config
                        This option makes it possible to use extroot functionality if the root filesystem resides on an UBIFS partition
 endef
 
                        This option makes it possible to use extroot functionality if the root filesystem resides on an UBIFS partition
 endef
 

+define Package/snapshot-tool
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=rootfs snapshoting tool
+  DEPENDS:=+libubox +fstools
+endef
+

 define Package/block-mount
   SECTION:=base
   CATEGORY:=Base system
 define Package/block-mount
   SECTION:=base
   CATEGORY:=Base system


@@ -61,10 +69,16 @@ endef
 define Package/fstools/install
        $(INSTALL_DIR) $(1)/sbin $(1)/lib
 
 define Package/fstools/install
        $(INSTALL_DIR) $(1)/sbin $(1)/lib
 

-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset,snapshot_tool} $(1)/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset} $(1)/sbin/

        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libfstools.so $(1)/lib/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libfstools.so $(1)/lib/

+       $(LN) jffs2reset $(1)/sbin/jffs2mark
+endef
+
+define Package/snapshot-tool/install
+       $(INSTALL_DIR) $(1)/sbin
+
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/snapshot_tool $(1)/sbin/

        $(INSTALL_BIN) ./files/snapshot $(1)/sbin/
        $(INSTALL_BIN) ./files/snapshot $(1)/sbin/

-       ln -s /sbin/jffs2reset $(1)/sbin/jffs2mark

 endef
 
 define Package/block-mount/install
 endef
 
 define Package/block-mount/install


@@ -76,8 +90,8 @@ define Package/block-mount/install
 
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblkid-tiny.so $(1)/lib/
 
        $(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
+       $(LN) ../../sbin/block $(1)/usr/sbin/swapon
+       $(LN) ../../sbin/block $(1)/usr/sbin/swapoff

 
 endef
 
 
 endef
 


@@ -89,4 +103,5 @@ define Build/InstallDev
 endef
 
 $(eval $(call BuildPackage,fstools))
 endef
 
 $(eval $(call BuildPackage,fstools))

+$(eval $(call BuildPackage,snapshot-tool))

 $(eval $(call BuildPackage,block-mount))
 $(eval $(call BuildPackage,block-mount))