From 79909436ed99f863f5e4fcd6c02e2ee152548cdc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 1 Jan 2017 13:31:04 +0100 Subject: busybox: disable fdisk applet, when util-linux fdisk is selected --- package/busybox/Config.in.manual | 8 +++++++- package/busybox/config/util-linux/Config.in | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'package/busybox') diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index 340a335fe..d7264a0e9 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -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 diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index c1c89f26d..c0658d131 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -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 -- cgit v1.2.3