[backfire] backport r20726 & r20727

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20728 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/block-mount/Makefile

@@ -11,8 +11,6 @@ PKG_NAME:=block-mount
 PKG_VERSION:=0.1.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/block-mount/Default
@@ -25,27 +23,6 @@ define Package/block-mount
   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
-endef
-
 define Package/block-mount/description
   Scripts used to mount and check block devices (filesystems and swap)
 endef
@@ -53,7 +30,7 @@ endef
 define Package/block-hotplug
   $(call Package/block-mount/Default)
   TITLE:=Automount and autocheck block devices
-  DEPENDS:=block-mount hotplug2
+  DEPENDS:=+block-mount +hotplug2
 endef
 
 define Package/block-hotplug/description

package/busybox/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.15.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \

package/busybox/config/util-linux/Config.in

@@ -29,7 +29,7 @@ config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT
 
 config BUSYBOX_CONFIG_BLKID
 	bool "blkid"
-	default n
+	default y
 	select BUSYBOX_CONFIG_VOLUMEID
 	help
 	  Lists labels and UUIDs of all filesystems.
@@ -395,7 +395,7 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
 
 config BUSYBOX_CONFIG_MKSWAP
 	bool "mkswap"
-	default n
+	default y
 	help
 	  The mkswap utility is used to configure a file or disk partition as
 	  Linux swap space. This allows Linux to use the entire file or
@@ -408,7 +408,7 @@ config BUSYBOX_CONFIG_MKSWAP
 
 config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
 	bool "UUID support"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_MKSWAP
 	help
 	  Generate swap spaces with universally unique identifiers.
@@ -440,28 +440,28 @@ config BUSYBOX_CONFIG_VOLUMEID
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
 	bool "Ext filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS
 	bool "Reiser filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT
 	bool "fat filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS
 	bool "hfs filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
@@ -482,28 +482,28 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS
 	bool "xfs filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS
 	bool "ntfs filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660
 	bool "iso9660 filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF
 	bool "udf filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
@@ -517,7 +517,7 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP
 	bool "linux swap filesystem"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
@@ -637,7 +637,7 @@ config BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2
 
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID
 	bool "linuxraid"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_VOLUMEID
 	help
 	  TODO
@@ -786,7 +786,7 @@ config BUSYBOX_CONFIG_SETARCH
 
 config BUSYBOX_CONFIG_SWAPONOFF
 	bool "swaponoff"
-	default n
+	default y
 	help
 	  This option enables both the 'swapon' and the 'swapoff' utilities.
 	  Once you have created some swap space using 'mkswap', you also need