mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
5c4277ec37
This is a big block(d) cleanup with new feature of generating "mount"
hotplug.d events.
It's an important update for those who were using mountd in the
pre-18.06 releases. Due to the mountd being replaced with blockd a
support for "mountd" hotplug.d events has been lost. It broke all kind
of shell scripts that were e.g. managing services depending on an
external USB drive availability.
This basically (re-)adds support for calling /etc/hotplug.d/mount/
scripts with ACTION ("add" or "remove") and DEVICE set.
af93f4b block(d): improve hotplug.d "mount" events for the autofs
3bb3352 blockd: unmount device explicitly when it disappears
28753b3 block: remove target directory after unmounting
c8c7ca5 block: cleanup handling "start" action of the "autofs" command
f1bb762 block: make blockd_notify() return an int instead of void
71c2bde block: generate hotplug.d mount events
30f5096 block: validate amount of arguments for the "autofs" command
dc6a462 blockd: don't reparse blob msg in the vlist callbacks
f6a9686 blockd: don't unmount device when removing it from the list
1913fea block: don't duplicate unmounting code in the mount_action()
6b445fa block: make umount_device() function more generic
a778468 block: don't duplicate mounting code in the mount_device()
5dc631d block: simplify code picking mount target directory
2971779 block: move blockd_notify() call out of the conditional blocks
b86bd6e block: fix formatting & indent in the mount_device()
e12c0d6 fstools: use EXIT_FAILURE when indicating error on exit
091aa3d fstools: guard usage of WEXITSTATUS
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
138 lines
4.0 KiB
Makefile
138 lines
4.0 KiB
Makefile
#
|
|
# Copyright (C) 2014-2015 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=fstools
|
|
PKG_RELEASE:=3
|
|
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
|
|
PKG_SOURCE_DATE:=2018-12-28
|
|
PKG_SOURCE_VERSION:=af93f4b8dc32cf1320dfe8f4b93bb3a12606fc33
|
|
PKG_MIRROR_HASH:=a2d8c2500fe75014ef16c039d8cdb276c1d5c066f8bce6550a3ecf46a9a411a9
|
|
CMAKE_INSTALL:=1
|
|
|
|
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 <john@phrozen.org>
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
|
|
TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
|
|
CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_UBIFS_EXTROOT),-DCMAKE_UBIFS_EXTROOT=y)
|
|
CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_OVL_MOUNT_FULL_ACCESS_TIME),-DCMAKE_OVL_MOUNT_FULL_ACCESS_TIME=y)
|
|
CMAKE_OPTIONS += $(if $(CONFIG_FSTOOLS_OVL_MOUNT_COMPRESS_ZLIB),-DCMAKE_OVL_MOUNT_COMPRESS_ZLIB=y)
|
|
|
|
define Package/fstools
|
|
SECTION:=base
|
|
CATEGORY:=Base system
|
|
DEPENDS:=+ubox +USE_GLIBC:librt +NAND_SUPPORT:ubi-utils
|
|
TITLE:=OpenWrt filesystem tools
|
|
MENU:=1
|
|
endef
|
|
|
|
define Package/fstools/config
|
|
config FSTOOLS_UBIFS_EXTROOT
|
|
depends on PACKAGE_fstools
|
|
depends on NAND_SUPPORT
|
|
bool "Support extroot functionality with UBIFS"
|
|
default y
|
|
help
|
|
This option makes it possible to use extroot functionality if the root filesystem resides on an UBIFS partition
|
|
|
|
config FSTOOLS_OVL_MOUNT_FULL_ACCESS_TIME
|
|
depends on PACKAGE_fstools
|
|
bool "Full access time accounting"
|
|
default n
|
|
help
|
|
This option enables the full access time accounting (warning: it will increase the flash writes).
|
|
|
|
config FSTOOLS_OVL_MOUNT_COMPRESS_ZLIB
|
|
depends on PACKAGE_fstools
|
|
bool "Compress using zlib"
|
|
default n
|
|
help
|
|
This option enables the compression using zlib on the storage device.
|
|
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
|
|
TITLE:=Block device mounting and checking
|
|
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
|
|
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset} $(1)/sbin/
|
|
$(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/
|
|
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/
|
|
|
|
$(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab
|
|
$(INSTALL_CONF) ./files/fstab.default $(1)/etc/uci-defaults/10-fstab
|
|
$(INSTALL_CONF) ./files/mount.hotplug $(1)/etc/hotplug.d/block/10-mount
|
|
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/block $(1)/sbin/
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblkid-tiny.so $(1)/lib/
|
|
$(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
|
|
$(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,snapshot-tool))
|
|
$(eval $(call BuildPackage,block-mount))
|
|
$(eval $(call BuildPackage,blockd))
|