Patchwork [v2,7/8] gptfdisk: add support for building and install cgdisk

login
register
mail settings
Submitter Thomas Petazzoni
Date March 7, 2013, 8:45 p.m.
Message ID <1362689131-1479-8-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/225943/
State Accepted
Headers show

Comments

Thomas Petazzoni - March 7, 2013, 8:45 p.m.
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.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gptfdisk/Config.in   |    8 ++++++++
 package/gptfdisk/gptfdisk.mk |    4 ++++
 2 files changed, 12 insertions(+)
Peter Korsgaard - March 10, 2013, 9:32 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> In addition to the command-line tool gdisk and the interactive tool
 Thomas> sgdisk, gptfdisk also provides a ncurses based tool, cgdisk. This
 Thomas> commit adds support for building and installing this tool.

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  package/gptfdisk/Config.in   |    8 ++++++++
 Thomas>  package/gptfdisk/gptfdisk.mk |    4 ++++
 Thomas>  2 files changed, 12 insertions(+)

 Thomas> diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
 Thomas> index 0d7e358..1cdd8eb 100644
 Thomas> --- a/package/gptfdisk/Config.in
 Thomas> +++ b/package/gptfdisk/Config.in
 Thomas> @@ -31,5 +31,13 @@ config BR2_PACKAGE_GPTFDISK_SGDISK
 Thomas>  	  /usr/sbin/sgdisk which is named after the traditional MBR based
 Thomas>  	  sfdisk tool albeit with an entirely different option syntax.
 
 Thomas> +config BR2_PACKAGE_GPTFDISK_CGDISK
 Thomas> +	bool "ncurses cgdisk"
 Thomas> +	depends on BR2_PACKAGE_GPTFDISK
 Thomas> +	select BR2_PACKAGE_NCURSES
 Thomas> +	help
 Thomas> +	  Install the ncurses-based GUID partition table (GPT)
 Thomas> +	  manipulator /usr/sbin/cgdisk.

You forgot to update the select-gdisk-if-nothing-else-is-enabled logic,
so I've fixed that and committed, thanks.

Patch

diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 0d7e358..1cdd8eb 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -31,5 +31,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 884edf4..63010d8 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