From 20a60679c463ef1ec83a870358a2114c1b9babd6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 7 Mar 2013 10:45:29 +0000 Subject: [PATCH] gptfdisk: add support for building and install cgdisk In addition to the command-line tool gdisk and the interactive tool sgdisk, gptfdisk also provides a ncurses based tool, cgdisk. This commit adds support for building and installing this tool. [Peter: Update gdisk autoselection logic to consider cgdisk as well] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gptfdisk/Config.in | 11 ++++++++++- package/gptfdisk/gptfdisk.mk | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in index 0d7e35836e..28b20df048 100644 --- a/package/gptfdisk/Config.in +++ b/package/gptfdisk/Config.in @@ -5,7 +5,8 @@ config BR2_PACKAGE_GPTFDISK depends on BR2_USE_WCHAR # util-linux select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_GPTFDISK_GDISK if !BR2_PACKAGE_GPTFDISK_SGDISK + select BR2_PACKAGE_GPTFDISK_GDISK if \ + !(BR2_PACKAGE_GPTFDISK_SGDISK || BR2_PACKAGE_GPTFDISK_CGDISK) help GPT fdisk (consisting of the gdisk and sgdisk programs) is a text-mode partitioning tool that works on Globally Unique Identifier @@ -31,5 +32,13 @@ config BR2_PACKAGE_GPTFDISK_SGDISK /usr/sbin/sgdisk which is named after the traditional MBR based sfdisk tool albeit with an entirely different option syntax. +config BR2_PACKAGE_GPTFDISK_CGDISK + bool "ncurses cgdisk" + depends on BR2_PACKAGE_GPTFDISK + select BR2_PACKAGE_NCURSES + help + Install the ncurses-based GUID partition table (GPT) + manipulator /usr/sbin/cgdisk. + comment "gptfdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled" depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 0478041d9a..15ec842de6 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -9,11 +9,15 @@ GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk +GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk GPTFDISK_DEPENDENCIES += util-linux ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) GPTFDISK_DEPENDENCIES += popt endif +ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) + GPTFDISK_DEPENDENCIES += ncurses +endif ifeq ($(BR2_PACKAGE_ICU),y) GPTFDISK_DEPENDENCIES += icu -- 2.30.2