X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/faf7173b4df3a152dbdc574751078b359c116d5b..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/block-mount/Makefile?ds=sidebyside diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile index a31096de3..05ca086d8 100644 --- a/package/block-mount/Makefile +++ b/package/block-mount/Makefile @@ -8,11 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=block-mount -PKG_VERSION:=0.1.0 +PKG_VERSION:=0.2.0 PKG_RELEASE:=1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/block-mount/Default @@ -23,44 +21,28 @@ endef define Package/block-mount $(call Package/block-mount/Default) TITLE:=Block device mounting and checking -endef - -define Package/block-mount/config - select BUSYBOX_CONFIG_MKSWAP - select BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID - select BUSYBOX_CONFIG_SWAPONOFF - select BUSYBOX_CONFIG_BLKID - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2 - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660 - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS - select BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS + DEPENDS:= +blkid +swap-utils + MENU:=1 endef define Package/block-mount/description - Scripts used to mount and check block devices (filesystems and swap) + Scripts used to mount and check block devices (filesystems and swap), as well + as hotplug scripts to automount and check block devices when hotplug event (e.g. + from plugging in a device) occurs. + Also includes preinit scripts for mounting a block device as the root filesystem. + This allows one to have the root filesystem on devices other than the built in flash + device. endef -define Package/block-hotplug - $(call Package/block-mount/Default) - TITLE:=Automount and autocheck block devices - DEPENDS:=block-mount hotplug2 +define Package/block-mount/config + source "$(SOURCE)/Config.in" endef -define Package/block-hotplug/description - Scripts used to automatically check and mount filesystem and/or swap +define Build/Compile endef -define Build/Compile +define Package/block-mount/conffiles +/etc/config/fstab endef define Package/block-mount/install @@ -72,15 +54,19 @@ define Package/block-mount/install $(INSTALL_DATA) ./files/mount.sh $(1)/lib/functions/ $(INSTALL_DATA) ./files/fsck.sh $(1)/lib/functions/ $(INSTALL_DATA) ./files/block.sh $(1)/lib/functions/ -endef - -define Package/block-hotplug/install $(INSTALL_DIR) $(1)/etc/hotplug.d/block $(INSTALL_DATA) ./files/10-swap $(1)/etc/hotplug.d/block/ $(INSTALL_DATA) ./files/20-fsck $(1)/etc/hotplug.d/block/ $(INSTALL_DATA) ./files/40-mount $(1)/etc/hotplug.d/block/ + $(INSTALL_DIR) $(1)/lib/functions + $(INSTALL_DATA) ./files/extmount.sh $(1)/lib/functions/ + $(INSTALL_DIR) $(1)/lib/preinit + $(INSTALL_DATA) ./files/50_determine_usb_root $(1)/lib/preinit/ + $(INSTALL_DATA) ./files/55_determine_extroot_sysupgrade $(1)/lib/preinit/ + $(INSTALL_DATA) ./files/60_pivot_usb_root $(1)/lib/preinit/ + $(INSTALL_DIR) $(1)/lib/preinit + echo "extroot_settle_time=\"$(CONFIG_EXTROOT_SETTLETIME)\"" >$(1)/lib/preinit/00_extroot.conf + $(INSTALL_DIR) $(1)/overlay endef $(eval $(call BuildPackage,block-mount)) -$(eval $(call BuildPackage,block-hotplug)) -