X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2FConfig.src;h=bb45705a999a37399360a6362b57ac0b76007476;hb=b8709032a3fb57b3ec536bdf9b92b526ed63b995;hp=c71b4de3820f8fbb56fb0fbf91e6225124972e6c;hpb=b507cc3aceda26eff851230223a62c6fb471573c;p=oweals%2Fbusybox.git

diff --git a/util-linux/Config.src b/util-linux/Config.src
index c71b4de38..bb45705a9 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -10,7 +10,7 @@ INSERT
 config ACPID
 	bool "acpid"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  acpid listens to ACPI events coming either in textual form from
 	  /proc/acpi/event (though it is marked deprecated it is still widely
@@ -33,17 +33,24 @@ config FEATURE_ACPID_COMPAT
 config BLKID
 	bool "blkid"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	select VOLUMEID
 	help
 	  Lists labels and UUIDs of all filesystems.
 	  WARNING:
 	  With all submodules selected, it will add ~8k to busybox.
 
+config FEATURE_BLKID_TYPE
+	bool "Print filesystem type"
+	default n
+	depends on BLKID
+	help
+	  Show TYPE="filesystem type"
+
 config DMESG
 	bool "dmesg"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  dmesg is used to examine or control the kernel ring buffer. When the
 	  Linux kernel prints messages to the system log, they are stored in
@@ -77,7 +84,7 @@ config FEATURE_DMESG_PRETTY
 config FBSET
 	bool "fbset"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  fbset is used to show or change the settings of a Linux frame buffer
 	  device. The frame buffer device provides a simple and unique
@@ -106,7 +113,7 @@ config FEATURE_FBSET_READMODE
 config FDFLUSH
 	bool "fdflush"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  fdflush is only needed when changing media on slightly-broken
 	  removable media drives. It is used to make Linux believe that a
@@ -119,14 +126,14 @@ config FDFLUSH
 config FDFORMAT
 	bool "fdformat"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  fdformat is used to low-level format a floppy disk.
 
 config FDISK
 	bool "fdisk"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  The fdisk utility is used to divide hard disks into one or more
 	  logical disks, which are generally called partitions. This utility
@@ -137,6 +144,7 @@ config FDISK_SUPPORT_LARGE_DISKS
 	bool "Support over 4GB disks"
 	default y
 	depends on FDISK
+	depends on !LFS   # with LFS no special code is needed
 	help
 	  Enable this option to support large disks > 4GB.
 
@@ -202,7 +210,7 @@ config FEATURE_FDISK_ADVANCED
 config FINDFS
 	bool "findfs"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	select VOLUMEID
 	help
 	  Prints the name of a filesystem with given label or UUID.
@@ -218,7 +226,7 @@ config FLOCK
 config FREERAMDISK
 	bool "freeramdisk"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  Linux allows you to create ramdisks. This utility allows you to
 	  delete them and completely free all memory that was used for the
@@ -241,14 +249,14 @@ config FSCK_MINIX
 config MKFS_EXT2
 	bool "mkfs_ext2"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  Utility to create EXT2 filesystems.
 
 config MKFS_MINIX
 	bool "mkfs_minix"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  The minix filesystem is a nice, small, compact, read-write filesystem
 	  with little overhead. If you wish to be able to create minix
@@ -266,7 +274,7 @@ config FEATURE_MINIX2
 config MKFS_REISER
 	bool "mkfs_reiser"
 	default n
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  Utility to create ReiserFS filesystems.
 	  Note: this applet needs a lot of testing and polishing.
@@ -274,7 +282,7 @@ config MKFS_REISER
 config MKFS_VFAT
 	bool "mkfs_vfat"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  Utility to create FAT32 filesystems.
 
@@ -323,7 +331,7 @@ config HD
 config HWCLOCK
 	bool "hwclock"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  The hwclock utility is used to read and set the hardware clock
 	  on a system. This is primarily used to set the current time on
@@ -354,7 +362,6 @@ config FEATURE_HWCLOCK_ADJTIME_FHS
 config IPCRM
 	bool "ipcrm"
 	default y
-	select FEATURE_SUID
 	help
 	  The ipcrm utility allows the removal of System V interprocess
 	  communication (IPC) objects and the associated data structures
@@ -363,8 +370,7 @@ config IPCRM
 config IPCS
 	bool "ipcs"
 	default y
-	depends on PLATFORM_LINUX
-	select FEATURE_SUID
+	select PLATFORM_LINUX
 	help
 	  The ipcs utility is used to provide information on the currently
 	  allocated System V interprocess (IPC) objects in the system.
@@ -372,7 +378,7 @@ config IPCS
 config LOSETUP
 	bool "losetup"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  losetup is used to associate or detach a loop device with a regular
 	  file or block device, and to query the status of a loop device. This
@@ -381,7 +387,7 @@ config LOSETUP
 config LSPCI
 	bool "lspci"
 	default y
-	#depends on PLATFORM_LINUX
+	#select PLATFORM_LINUX
 	help
 	  lspci is a utility for displaying information about PCI buses in the
 	  system and devices connected to them.
@@ -391,7 +397,7 @@ config LSPCI
 config LSUSB
 	bool "lsusb"
 	default y
-	#depends on PLATFORM_LINUX
+	#select PLATFORM_LINUX
 	help
 	  lsusb is a utility for displaying information about USB buses in the
 	  system and devices connected to them.
@@ -401,7 +407,7 @@ config LSUSB
 config MDEV
 	bool "mdev"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  mdev is a mini-udev implementation for dynamically creating device
 	  nodes in the /dev directory.
@@ -489,7 +495,7 @@ config MORE
 config MOUNT
 	bool "mount"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  All files and filesystems in Unix are arranged into one big directory
 	  tree. The 'mount' utility is used to graft a filesystem onto a
@@ -572,7 +578,7 @@ config FEATURE_MOUNT_FSTAB
 config PIVOT_ROOT
 	bool "pivot_root"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  The pivot_root utility swaps the mount points for the root filesystem
 	  with some other mounted filesystem. This allows you to do all sorts
@@ -600,14 +606,14 @@ config RDEV
 config READPROFILE
 	bool "readprofile"
 	default y
-	#depends on PLATFORM_LINUX
+	#select PLATFORM_LINUX
 	help
 	  This allows you to parse /proc/profile for basic profiling.
 
 config RTCWAKE
 	bool "rtcwake"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  Enter a system sleep state until specified wakeup time.
 
@@ -627,7 +633,7 @@ config SCRIPTREPLAY
 config SETARCH
 	bool "setarch"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  The linux32 utility is used to create a 32bit environment for the
 	  specified program (usually a shell). It only makes sense to have
@@ -637,7 +643,7 @@ config SETARCH
 config SWAPONOFF
 	bool "swaponoff"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  This option enables both the 'swapon' and the 'swapoff' utilities.
 	  Once you have created some swap space using 'mkswap', you also need
@@ -656,7 +662,7 @@ config FEATURE_SWAPON_PRI
 config SWITCH_ROOT
 	bool "switch_root"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  The switch_root utility is used from initramfs to select a new
 	  root device. Under initramfs, you have to use this instead of
@@ -676,7 +682,7 @@ config SWITCH_ROOT
 config UMOUNT
 	bool "umount"
 	default y
-	depends on PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
 	  When you want to remove a mounted filesystem from its current mount
 	  point, for example when you are shutting down the system, the