From 012ea4a5a39c8d59c599e7753727950fa5f83809 Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Sun, 27 Mar 2011 06:40:51 +0000 Subject: [PATCH] [package] block-mount: Merged block-mount, block-extroot, and block-hotplug into a single binary package called block-mount. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26314 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/block-extroot/Makefile | 64 ------------------- .../{block-extroot => block-mount}/Config.in | 2 +- package/block-mount/Makefile | 36 ++++++----- .../files/50_determine_usb_root | 0 .../files/55_determine_extroot_sysupgrade | 0 .../files/60_pivot_usb_root | 0 .../files/extmount.sh | 0 7 files changed, 21 insertions(+), 81 deletions(-) delete mode 100644 package/block-extroot/Makefile rename package/{block-extroot => block-mount}/Config.in (98%) rename package/{block-extroot => block-mount}/files/50_determine_usb_root (100%) rename package/{block-extroot => block-mount}/files/55_determine_extroot_sysupgrade (100%) rename package/{block-extroot => block-mount}/files/60_pivot_usb_root (100%) rename package/{block-extroot => block-mount}/files/extmount.sh (100%) diff --git a/package/block-extroot/Makefile b/package/block-extroot/Makefile deleted file mode 100644 index 3b3ce68cae..0000000000 --- a/package/block-extroot/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (C) 2009-2010 OpenWrt.org -# Copyright (C) 2010 Vertical Communications -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=block-extroot -PKG_VERSION:=0.0.1 -PKG_RELEASE:=3 - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - -include $(INCLUDE_DIR)/package.mk - -define Package/block-extroot/Default - SECTION:=base - CATEGORY:=Base system - TITLE:=root filesystem on secondary storage -endef - -define Package/block-extroot - $(call Package/block-extroot/Default) - MENU:=1 - DEPENDS:=+block-mount @PACKAGE_kmod-ide-core||PACKAGE_kmod-ata-core||PACKAGE_kmod-usb-storage||PACKAGE_kmod-mmc||PACKAGE_kmod-broadcom-sdhc -endef - -define Package/block-extroot/config - source "$(SOURCE)/Config.in" -endef - -define Package/block-extroot/description - Based on the moduluarized preinit and firstboot, adds the option to have - the root filesystem on storage other than the jffs or the boot root device. - For a squashfs image this package must be installed into the image, not as - a package to add later. -endef - -define Build/Prepare -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/block-extroot/install - $(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-extroot)) - diff --git a/package/block-extroot/Config.in b/package/block-mount/Config.in similarity index 98% rename from package/block-extroot/Config.in rename to package/block-mount/Config.in index dbf1041c15..2fa10b6685 100644 --- a/package/block-extroot/Config.in +++ b/package/block-mount/Config.in @@ -7,7 +7,7 @@ config EXTROOT_SETTLETIME int - prompt "Settle time for root block device (s)" if PACKAGE_block-extroot + prompt "Settle time for root block device (s)" if PACKAGE_block-mount default 20 help This is the amount of time, in seconds, to wait for the block device diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile index 267a200db4..05ca086d8e 100644 --- a/package/block-mount/Makefile +++ b/package/block-mount/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=block-mount -PKG_VERSION:=0.1.0 -PKG_RELEASE:=3 +PKG_VERSION:=0.2.0 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk @@ -22,20 +22,20 @@ define Package/block-mount $(call Package/block-mount/Default) TITLE:=Block device mounting and checking 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 -endef - -define Package/block-hotplug/description - Scripts used to automatically check and mount filesystem and/or swap +define Package/block-mount/config + source "$(SOURCE)/Config.in" endef define Build/Compile @@ -54,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)) - diff --git a/package/block-extroot/files/50_determine_usb_root b/package/block-mount/files/50_determine_usb_root similarity index 100% rename from package/block-extroot/files/50_determine_usb_root rename to package/block-mount/files/50_determine_usb_root diff --git a/package/block-extroot/files/55_determine_extroot_sysupgrade b/package/block-mount/files/55_determine_extroot_sysupgrade similarity index 100% rename from package/block-extroot/files/55_determine_extroot_sysupgrade rename to package/block-mount/files/55_determine_extroot_sysupgrade diff --git a/package/block-extroot/files/60_pivot_usb_root b/package/block-mount/files/60_pivot_usb_root similarity index 100% rename from package/block-extroot/files/60_pivot_usb_root rename to package/block-mount/files/60_pivot_usb_root diff --git a/package/block-extroot/files/extmount.sh b/package/block-mount/files/extmount.sh similarity index 100% rename from package/block-extroot/files/extmount.sh rename to package/block-mount/files/extmount.sh