fstools: update to latest git HEAD

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

diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index f32ac2e35f50729f9a11ab33a7f9d6cadbeeb464..e26e39b5458b8583b980f375fcf33d6e56184aea 100644 (file)
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -8,24 +8,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fstools
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fstools

-PKG_VERSION:=2015-03-30
-
-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:=a5fa5b6144253726dcd7e769197eed787a723f5f
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
+PKG_SOURCE_DATE:=2018-01-13
+PKG_SOURCE_VERSION:=18090d97b61cc091ed3f49c3ec8ba42c761f1d15
+PKG_MIRROR_HASH:=165c1b19778138910905528ead080413fb741c5dfc191da72979c00d49df6e0d

 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


@@ -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


@@ -58,13 +66,26 @@ define Package/block-mount
   DEPENDS:=+ubox +libubox +libuci
 endef
 
   DEPENDS:=+ubox +libubox +libuci
 endef
 

+define Package/blockd
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Block device automounting
+  DEPENDS:=+block-mount +fstools +libubus +kmod-fs-autofs4
+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,9 +97,15 @@ 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

 
 

+define Package/blockd/install
+       $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blockd $(1)/sbin/
+       $(INSTALL_BIN) ./files/blockd.init $(1)/etc/init.d/blockd

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -89,4 +116,6 @@ 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))

+$(eval $(call BuildPackage,blockd))