Changeset 20728

Timestamp:

2010-04-06T03:02:12+02:00 (8 years ago)

Author:

nico

Message:

[backfire] backport r20726 & r20727

Location:

branches/backfire/package

Files:

• block-mount/Makefile (modified) (3 diffs)
• busybox/Makefile (modified) (1 diff)
• busybox/config/util-linux/Config.in (modified) (14 diffs)

branches/backfire/package/block-mount/Makefile

@@ -12 +12 @@
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
@@ -26 +24 @@
 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)
@@ -54 +31 @@
   $(call Package/block-mount/Default)
   TITLE:=Automount and autocheck block devices
-  DEPENDS:=block-mount hotplug2
+  DEPENDS:=+block-mount +hotplug2
 endef
 

branches/backfire/package/busybox/Makefile

@@ -10 +10 @@
 PKG_NAME:=busybox
 PKG_VERSION:=1.15.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

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

@@ -30 +30 @@
 config BUSYBOX_CONFIG_BLKID
         bool "blkid"
-        default n
+        default y
         select BUSYBOX_CONFIG_VOLUMEID
         help
@@ -396 +396 @@
 config BUSYBOX_CONFIG_MKSWAP
         bool "mkswap"
-        default n
+        default y
         help
           The mkswap utility is used to configure a file or disk partition as
@@ -409 +409 @@
 config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
         bool "UUID support"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_MKSWAP
         help
@@ -441 +441 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
         bool "Ext filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -448 +448 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS
         bool "Reiser filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -455 +455 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT
         bool "fat filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -462 +462 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS
         bool "hfs filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -483 +483 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS
         bool "xfs filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -490 +490 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS
         bool "ntfs filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -497 +497 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660
         bool "iso9660 filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -504 +504 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF
         bool "udf filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -518 +518 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP
         bool "linux swap filesystem"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -638 +638 @@
 config BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID
         bool "linuxraid"
-        default n
+        default y
         depends on BUSYBOX_CONFIG_VOLUMEID
         help
@@ -787 +787 @@
 config BUSYBOX_CONFIG_SWAPONOFF
         bool "swaponoff"
-        default n
+        default y
         help
           This option enables both the 'swapon' and the 'swapoff' utilities.