Home Explore Help
Sign In
oss
/
openadk
4
1
Fork 3
Files Issues 1 Pull Requests 0 Wiki
Browse Source

busybox: disable fdisk applet, when util-linux fdisk is selected

Waldemar Brodkorb 7 years ago
parent
3784b281a8
commit
79909436ed
2 changed files with 8 additions and 1 deletions
Split View Show Diff Stats
  1. 7 1
      package/busybox/Config.in.manual
  2. 1 0
      package/busybox/config/util-linux/Config.in

+ 7 - 1
package/busybox/Config.in.manual
View File 

@@ -22,7 +22,7 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT
 
 	select BUSYBOX_WHOAMI
 
 	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 
 	select BUSYBOX_TRUE
 
-	select BUSYBOX_FDISK
 
+	select BUSYBOX_FDISK if !BUSYBOX_DISABLE_FDISK
 
 	select BUSYBOX_NC
 
 	select BUSYBOX_RDATE
 
 	select BUSYBOX_GUNZIP
 
@@ -390,6 +390,12 @@ config BUSYBOX_DISABLE_LSUSB
 
 	depends on ADK_PACKAGE_LSUSB
 
 	default n
 
 
+config BUSYBOX_DISABLE_FDISK
 
+	bool
 
+	default y if ADK_PACKAGE_FDISK
 
+	depends on ADK_PACKAGE_FDISK
 
+	default n
 
+
 
 config BUSYBOX_DISABLE_GREP
 
 	bool
 
 	default y if ADK_PACKAGE_GREP

+ 1 - 0
package/busybox/config/util-linux/Config.in
View File 

@@ -275,6 +275,7 @@ config BUSYBOX_FDFORMAT
 
 config BUSYBOX_FDISK
 
 	bool "fdisk"
 
 	default n
 
+	depends on !BUSYBOX_DISABLE_FDISK
 
 	select BUSYBOX_PLATFORM_LINUX
 
 	help
 
 	  The fdisk utility is used to divide hard disks into one or more