Changeset 20728 for branches/backfire


Ignore:
Timestamp:
2010-04-06T03:02:12+02:00 (7 years ago)
Author:
nico
Message:

[backfire] backport r20726 & r20727

Location:
branches/backfire/package
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/block-mount/Makefile

    r19877 r20728  
    1212PKG_RELEASE:=1 
    1313 
    14 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) 
    15  
    1614include $(INCLUDE_DIR)/package.mk 
    1715 
     
    2624endef 
    2725 
    28 define Package/block-mount/config 
    29   select BUSYBOX_CONFIG_MKSWAP 
    30   select BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID 
    31   select BUSYBOX_CONFIG_SWAPONOFF 
    32   select BUSYBOX_CONFIG_BLKID 
    33   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT 
    34   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS 
    35   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT 
    36   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS 
    37   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS 
    38   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS 
    39   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS 
    40   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV 
    41   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2 
    42   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660 
    43   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF 
    44   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP 
    45   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS 
    46   select BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS 
    47 endef 
    48  
    4926define Package/block-mount/description 
    5027  Scripts used to mount and check block devices (filesystems and swap) 
     
    5431  $(call Package/block-mount/Default) 
    5532  TITLE:=Automount and autocheck block devices 
    56   DEPENDS:=block-mount hotplug2 
     33  DEPENDS:=+block-mount +hotplug2 
    5734endef 
    5835 
  • branches/backfire/package/busybox/Makefile

    r19853 r20728  
    1010PKG_NAME:=busybox 
    1111PKG_VERSION:=1.15.3 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
  • branches/backfire/package/busybox/config/util-linux/Config.in

    r18684 r20728  
    3030config BUSYBOX_CONFIG_BLKID 
    3131        bool "blkid" 
    32         default n 
     32        default y 
    3333        select BUSYBOX_CONFIG_VOLUMEID 
    3434        help 
     
    396396config BUSYBOX_CONFIG_MKSWAP 
    397397        bool "mkswap" 
    398         default n 
     398        default y 
    399399        help 
    400400          The mkswap utility is used to configure a file or disk partition as 
     
    409409config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID 
    410410        bool "UUID support" 
    411         default n 
     411        default y 
    412412        depends on BUSYBOX_CONFIG_MKSWAP 
    413413        help 
     
    441441config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT 
    442442        bool "Ext filesystem" 
    443         default n 
     443        default y 
    444444        depends on BUSYBOX_CONFIG_VOLUMEID 
    445445        help 
     
    448448config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS 
    449449        bool "Reiser filesystem" 
    450         default n 
     450        default y 
    451451        depends on BUSYBOX_CONFIG_VOLUMEID 
    452452        help 
     
    455455config BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT 
    456456        bool "fat filesystem" 
    457         default n 
     457        default y 
    458458        depends on BUSYBOX_CONFIG_VOLUMEID 
    459459        help 
     
    462462config BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS 
    463463        bool "hfs filesystem" 
    464         default n 
     464        default y 
    465465        depends on BUSYBOX_CONFIG_VOLUMEID 
    466466        help 
     
    483483config BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS 
    484484        bool "xfs filesystem" 
    485         default n 
     485        default y 
    486486        depends on BUSYBOX_CONFIG_VOLUMEID 
    487487        help 
     
    490490config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS 
    491491        bool "ntfs filesystem" 
    492         default n 
     492        default y 
    493493        depends on BUSYBOX_CONFIG_VOLUMEID 
    494494        help 
     
    497497config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660 
    498498        bool "iso9660 filesystem" 
    499         default n 
     499        default y 
    500500        depends on BUSYBOX_CONFIG_VOLUMEID 
    501501        help 
     
    504504config BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF 
    505505        bool "udf filesystem" 
    506         default n 
     506        default y 
    507507        depends on BUSYBOX_CONFIG_VOLUMEID 
    508508        help 
     
    518518config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP 
    519519        bool "linux swap filesystem" 
    520         default n 
     520        default y 
    521521        depends on BUSYBOX_CONFIG_VOLUMEID 
    522522        help 
     
    638638config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID 
    639639        bool "linuxraid" 
    640         default n 
     640        default y 
    641641        depends on BUSYBOX_CONFIG_VOLUMEID 
    642642        help 
     
    787787config BUSYBOX_CONFIG_SWAPONOFF 
    788788        bool "swaponoff" 
    789         default n 
     789        default y 
    790790        help 
    791791          This option enables both the 'swapon' and the 'swapoff' utilities. 
Note: See TracChangeset for help on using the changeset viewer.