fstools: update to latest git HEAD

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

diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index 46561aa6e2c94da9477a8ed64d926a5f86d375b6..61fc5daa8bf1d7c00488c815747e86a50fccc15c 100644 (file)
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -8,16 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fstools
-PKG_VERSION:=2016-09-08
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(LEDE_GIT)/project/fstools.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=fe514c9a20365ba00232c2c981463f43a4a41a7d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_MD5SUM:=f517c53ef17a1f94ea225b3ce69e15cbcc4dcb375558ef3cccfabee75878e34b
+PKG_SOURCE_DATE:=2018-01-02
+PKG_SOURCE_VERSION:=11efbf3b90f031ce634fc38cad07a4aef2985777
+PKG_MIRROR_HASH:=35f14ea0ed799d2eb972f4901116a0e447d4bc1e37fb0edb239c44b270aeae18
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -26,6 +23,7 @@ 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 <john@phrozen.org>
@@ -68,6 +66,13 @@ define Package/block-mount
   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
 
@@ -97,6 +102,12 @@ define Package/block-mount/install
 
 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
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
@@ -107,3 +118,4 @@ endef
 $(eval $(call BuildPackage,fstools))
 $(eval $(call BuildPackage,snapshot-tool))
 $(eval $(call BuildPackage,block-mount))
+$(eval $(call BuildPackage,blockd))