From 2df44ef167f084559dc3c19eb1660227f9bb564d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 23 Dec 2016 08:19:04 +0100
Subject: busybox: update to 1.26.0

---
 package/busybox/config/util-linux/Config.in | 64 +++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 7 deletions(-)

(limited to 'package/busybox/config/util-linux/Config.in')

diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index f2e84a71a..00f98a722 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -90,6 +90,27 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
 	  /lib/firmware/ and if it exists, send it to the kernel for
 	  loading into the hardware.
 
+config BUSYBOX_MKE2FS
+	bool "mke2fs"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Utility to create EXT2 filesystems.
+
+config BUSYBOX_MKFS_EXT2
+	bool "mkfs.ext2"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Alias to "mke2fs".
+
+config BUSYBOX_MKDOSFS
+	bool "mkdosfs"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Utility to create FAT32 filesystems.
+
 config BUSYBOX_NSENTER
 	bool "nsenter"
 	default n
@@ -445,7 +466,6 @@ config BUSYBOX_FEATURE_HEXDUMP_REVERSE
 config BUSYBOX_HD
 	bool "hd"
 	default n
-	depends on BUSYBOX_HEXDUMP
 	help
 	  hd is an alias to hexdump -C.
 
@@ -720,12 +740,26 @@ config BUSYBOX_SETARCH
 	  this util on a system that supports both 64bit and 32bit userland
 	  (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
-config BUSYBOX_SWAPONOFF
-	bool "swaponoff"
+config BUSYBOX_LINUX32
+	bool "linux32"
 	default n
-	select BUSYBOX_PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
-	  This option enables both the 'swapon' and the 'swapoff' utilities.
+	  Alias to "setarch linux32".
+
+config BUSYBOX_LINUX64
+	bool "linux64"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Alias to "setarch linux64".
+
+config BUSYBOX_SWAPON
+	bool "swapon"
+	default y
+	select PLATFORM_LINUX
+	help
+	  This option enables the 'swapon' utility.
 	  Once you have created some swap space using 'mkswap', you also need
 	  to enable your swap space with the 'swapon' utility. The 'swapoff'
 	  utility is used, typically at system shutdown, to disable any swap
@@ -735,7 +769,7 @@ config BUSYBOX_SWAPONOFF
 config BUSYBOX_FEATURE_SWAPON_DISCARD
 	bool "Support discard option -d"
 	default n
-	depends on BUSYBOX_SWAPONOFF
+	depends on BUSYBOX_SWAPON
 	help
 	  Enable support for discarding swap area blocks at swapon and/or as
 	  the kernel frees them. This option enables both the -d option on
@@ -744,10 +778,17 @@ config BUSYBOX_FEATURE_SWAPON_DISCARD
 config BUSYBOX_FEATURE_SWAPON_PRI
 	bool "Support priority option -p"
 	default y
-	depends on BUSYBOX_SWAPONOFF
+	depends on BUSYBOX_SWAPON
 	help
 	  Enable support for setting swap device priority in swapon.
 
+config BUSYBOX_SWAPOFF
+	bool "swapoff"
+	default n
+	select PLATFORM_LINUX
+	help
+	  This option enables the 'swapoff' utility.
+
 config BUSYBOX_SWITCH_ROOT
 	bool "switch_root"
 	default n
@@ -1103,6 +1144,15 @@ config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_UBIFS
+	bool "UBIFS filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  UBIFS (Unsorted Block Image File System) is a file
+	  system for use with raw flash memory media.
+
+
 endmenu
 
 endmenu
-- 
cgit v1.2.3