Changeset 26314 for trunk


Ignore:
Timestamp:
2011-03-27T08:40:51+02:00 (6 years ago)
Author:
cshore
Message:

[package] block-mount: Merged block-mount, block-extroot, and block-hotplug into a single binary package called block-mount.

Location:
trunk/package
Files:
1 deleted
1 edited
5 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/block-mount/Config.in

    r26313 r26314  
    88config EXTROOT_SETTLETIME 
    99        int 
    10         prompt "Settle time for root block device (s)" if PACKAGE_block-extroot 
     10        prompt "Settle time for root block device (s)" if PACKAGE_block-mount 
    1111        default 20 
    1212        help 
  • trunk/package/block-mount/Makefile

    r26313 r26314  
    99 
    1010PKG_NAME:=block-mount 
    11 PKG_VERSION:=0.1.0 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=0.2.0 
     12PKG_RELEASE:=1 
    1313 
    1414include $(INCLUDE_DIR)/package.mk 
     
    2323  TITLE:=Block device mounting and checking 
    2424  DEPENDS:= +blkid +swap-utils  
     25  MENU:=1 
    2526endef 
    2627 
    2728define Package/block-mount/description 
    28   Scripts used to mount and check block devices (filesystems and swap) 
     29  Scripts used to mount and check block devices (filesystems and swap), as well 
     30  as hotplug scripts to automount and check block devices when hotplug event (e.g. 
     31  from plugging in a device) occurs. 
     32  Also includes preinit scripts for mounting a block device as the root filesystem. 
     33  This allows one to have the root filesystem on devices other than the built in flash 
     34  device. 
    2935endef 
    3036 
    31 define Package/block-hotplug 
    32   $(call Package/block-mount/Default) 
    33   TITLE:=Automount and autocheck block devices 
    34   DEPENDS:=+block-mount +hotplug2 
    35 endef 
    36  
    37 define Package/block-hotplug/description 
    38   Scripts used to automatically check and mount filesystem and/or swap 
     37define Package/block-mount/config 
     38        source "$(SOURCE)/Config.in" 
    3939endef 
    4040 
     
    5555        $(INSTALL_DATA) ./files/fsck.sh $(1)/lib/functions/ 
    5656        $(INSTALL_DATA) ./files/block.sh $(1)/lib/functions/ 
    57 endef 
    58  
    59 define Package/block-hotplug/install 
    6057        $(INSTALL_DIR) $(1)/etc/hotplug.d/block 
    6158        $(INSTALL_DATA) ./files/10-swap $(1)/etc/hotplug.d/block/ 
    6259        $(INSTALL_DATA) ./files/20-fsck $(1)/etc/hotplug.d/block/ 
    6360        $(INSTALL_DATA) ./files/40-mount $(1)/etc/hotplug.d/block/ 
     61        $(INSTALL_DIR) $(1)/lib/functions 
     62        $(INSTALL_DATA) ./files/extmount.sh $(1)/lib/functions/ 
     63        $(INSTALL_DIR) $(1)/lib/preinit 
     64        $(INSTALL_DATA) ./files/50_determine_usb_root $(1)/lib/preinit/ 
     65        $(INSTALL_DATA) ./files/55_determine_extroot_sysupgrade $(1)/lib/preinit/ 
     66        $(INSTALL_DATA) ./files/60_pivot_usb_root $(1)/lib/preinit/ 
     67        $(INSTALL_DIR) $(1)/lib/preinit 
     68        echo "extroot_settle_time=\"$(CONFIG_EXTROOT_SETTLETIME)\"" >$(1)/lib/preinit/00_extroot.conf 
     69        $(INSTALL_DIR) $(1)/overlay 
    6470endef 
    6571 
    6672$(eval $(call BuildPackage,block-mount)) 
    67 $(eval $(call BuildPackage,block-hotplug)) 
    68  
Note: See TracChangeset for help on using the changeset viewer.