* [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging
@ 2013-03-07 20:45 Thomas Petazzoni
2013-03-07 20:45 ` [Buildroot] [PATCH v2 1/8] gdisk: Update gdisk (gptfdisk) to version 0.8.6 Thomas Petazzoni
` (7 more replies)
0 siblings, 8 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
Hello,
The starting point of this patch set was the patch from Justin Maggard
visible at http://patchwork.ozlabs.org/patch/164770/. I took Justin
patch, and did a number of followup improvements to the package.
Changes since v1:
* Rebased on top of master, fixed Config.in.legacy code since 2013.02
has been released.
Best regards,
Thomas
Justin Maggard (1):
gdisk: Update gdisk (gptfdisk) to version 0.8.6
Thomas Petazzoni (7):
gdisk: rename to gptfdisk
gptfdisk: ensure that the package always builds/installs something
gptfdisk: use TARGET_CONFIGURE_OPTS properly, use TARGET_MAKE_ENV
gptfdisk: fix installation step
gptfdisk: make utf16 support configurable
gptfdisk: add support for building and install cgdisk
gptfdisk: factorize the BR2_PACKAGE_GPTFDISK dependency
Config.in.legacy | 26 +++++++++++
package/Config.in | 2 +-
package/gdisk/Config.in | 36 ---------------
package/gdisk/gdisk-0.6.14-unistd.patch | 19 --------
package/gdisk/gdisk-0.6.14-uuid.h.patch | 22 ---------
package/gdisk/gdisk.mk | 39 ----------------
package/gptfdisk/Config.in | 44 ++++++++++++++++++
.../gptfdisk-001-configurable-utf16-support.patch | 48 ++++++++++++++++++++
package/gptfdisk/gptfdisk.mk | 42 +++++++++++++++++
9 files changed, 161 insertions(+), 117 deletions(-)
delete mode 100644 package/gdisk/Config.in
delete mode 100644 package/gdisk/gdisk-0.6.14-unistd.patch
delete mode 100644 package/gdisk/gdisk-0.6.14-uuid.h.patch
delete mode 100644 package/gdisk/gdisk.mk
create mode 100644 package/gptfdisk/Config.in
create mode 100644 package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
create mode 100644 package/gptfdisk/gptfdisk.mk
--
1.7.9.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 1/8] gdisk: Update gdisk (gptfdisk) to version 0.8.6
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:06 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 2/8] gdisk: rename to gptfdisk Thomas Petazzoni
` (6 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
From: Justin Maggard <jmaggard10@gmail.com>
[Thomas Petazzoni: bump to 0.8.6 and not 0.8.5]
Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gdisk/gdisk-0.6.14-unistd.patch | 19 --------------
package/gdisk/gdisk-0.6.14-uuid.h.patch | 22 ----------------
package/gdisk/gdisk-001-no-utf16.patch | 43 +++++++++++++++++++++++++++++++
package/gdisk/gdisk.mk | 6 ++---
4 files changed, 46 insertions(+), 44 deletions(-)
delete mode 100644 package/gdisk/gdisk-0.6.14-unistd.patch
delete mode 100644 package/gdisk/gdisk-0.6.14-uuid.h.patch
create mode 100644 package/gdisk/gdisk-001-no-utf16.patch
diff --git a/package/gdisk/gdisk-0.6.14-unistd.patch b/package/gdisk/gdisk-0.6.14-unistd.patch
deleted file mode 100644
index 97627da..0000000
--- a/package/gdisk/gdisk-0.6.14-unistd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-[PATCH] close(2) needs unistd.h
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- diskio-unix.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: gdisk-0.6.14/diskio-unix.cc
-===================================================================
---- gdisk-0.6.14.orig/diskio-unix.cc
-+++ gdisk-0.6.14/diskio-unix.cc
-@@ -22,6 +22,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- #include <iostream>
-
- #include "diskio.h"
diff --git a/package/gdisk/gdisk-0.6.14-uuid.h.patch b/package/gdisk/gdisk-0.6.14-uuid.h.patch
deleted file mode 100644
index ba447a1..0000000
--- a/package/gdisk/gdisk-0.6.14-uuid.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] Don't hardcode uuid.h location
-
-Breaks cross compilation.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- guid.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gdisk-0.6.14/guid.h
-===================================================================
---- gdisk-0.6.14.orig/guid.h
-+++ gdisk-0.6.14/guid.h
-@@ -22,7 +22,7 @@
- #ifdef _WIN32
- typedef unsigned char my_uuid_t[16];
- #else
--#include </usr/include/uuid/uuid.h>
-+#include <uuid/uuid.h>
- typedef uuid_t my_uuid_t;
- #endif
-
diff --git a/package/gdisk/gdisk-001-no-utf16.patch b/package/gdisk/gdisk-001-no-utf16.patch
new file mode 100644
index 0000000..540e741
--- /dev/null
+++ b/package/gdisk/gdisk-001-no-utf16.patch
@@ -0,0 +1,43 @@
+[PATCH] Disable UTF16 support
+
+libicu is quite large, and unicode partition names are uncommon.
+
+Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
+---
+diff -ur gdisk-0.8.5/Makefile gptfdisk-0.8.5/Makefile
+--- gdisk-0.8.5/Makefile 2012-05-30 08:38:43.000000000 -0700
++++ gptfdisk-0.8.5/Makefile 2012-06-05 11:38:23.710597974 -0700
+@@ -1,8 +1,8 @@
+ CC=gcc
+ CXX=g++
+ CFLAGS+=-D_FILE_OFFSET_BITS=64
+-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
+ LDFLAGS+=
+ LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
+ MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
+@@ -14,16 +14,16 @@
+ all: cgdisk gdisk sgdisk fixparts
+
+ gdisk: $(LIB_OBJS) gdisk.o gpttext.o
+-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
+- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
++# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
+
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
+- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
++# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
+
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
+- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
++# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
+
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
index f933436..cda369e 100644
--- a/package/gdisk/gdisk.mk
+++ b/package/gdisk/gdisk.mk
@@ -4,9 +4,9 @@
#
#############################################################
-GDISK_VERSION = 0.6.14
-GDISK_SITE = http://downloads.sourceforge.net/project/gptfdisk/gptfdisk/$(GDISK_VERSION)
-GDISK_SOURCE = gdisk-$(GDISK_VERSION).tgz
+GDISK_VERSION = 0.8.6
+GDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
+GDISK_SOURCE = gptfdisk-$(GDISK_VERSION).tar.gz
GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk
GDISK_TARGETS_$(BR2_PACKAGE_GDISK_SGDISK) += sgdisk
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 2/8] gdisk: rename to gptfdisk
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
2013-03-07 20:45 ` [Buildroot] [PATCH v2 1/8] gdisk: Update gdisk (gptfdisk) to version 0.8.6 Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:07 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 3/8] gptfdisk: ensure that the package always builds/installs something Thomas Petazzoni
` (5 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
In order to match the new upstream name, rename the gdisk package to
gptfdisk. We add the relevant legacy configuration options to ensure a
smooth transition for users.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in.legacy | 26 ++++++++++++++++
package/Config.in | 2 +-
package/gdisk/Config.in | 36 ---------------------
package/gdisk/gdisk-001-no-utf16.patch | 43 --------------------------
package/gdisk/gdisk.mk | 39 -----------------------
package/gptfdisk/Config.in | 36 +++++++++++++++++++++
package/gptfdisk/gptfdisk-001-no-utf16.patch | 43 ++++++++++++++++++++++++++
package/gptfdisk/gptfdisk.mk | 38 +++++++++++++++++++++++
8 files changed, 144 insertions(+), 119 deletions(-)
delete mode 100644 package/gdisk/Config.in
delete mode 100644 package/gdisk/gdisk-001-no-utf16.patch
delete mode 100644 package/gdisk/gdisk.mk
create mode 100644 package/gptfdisk/Config.in
create mode 100644 package/gptfdisk/gptfdisk-001-no-utf16.patch
create mode 100644 package/gptfdisk/gptfdisk.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index d90132c..5be142a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -40,6 +40,32 @@ comment "As long as these options stay selected, the build "
comment "will fail. "
endif
+#
+# Legacy options since 2013.02
+#
+
+config BR2_PACKAGE_GDISK
+ bool "gdisk has been replaced by gptfdisk"
+ select BR2_LEGACY
+ select BR2_PACKAGE_GPTFDISK
+ help
+ The option has been renamed BR2_PACKAGE_GPTFDISK.
+
+config BR2_PACKAGE_GDISK_GDISK
+ bool "gdisk tool from gdisk has been replaced by gdisk in gptfdisk"
+ select BR2_LEGACY
+ select BR2_PACKAGE_GPTFDISK
+ select BR2_PACKAGE_GPTFDISK_GDISK
+ help
+ The option has been renamed BR2_PACKAGE_GPTFDISK_GDISK.
+
+config BR2_PACKAGE_GDISK_SGDISK
+ bool "sgdisk tool from gdisk has been replaced by sgdisk in gptfdisk"
+ select BR2_LEGACY
+ select BR2_PACKAGE_GPTFDISK
+ select BR2_PACKAGE_GPTFDISK_SGDISK
+ help
+ The option has been renamed BR2_PACKAGE_GPTFDISK_SGDISK.
#
# Legacy options since 2012.11
diff --git a/package/Config.in b/package/Config.in
index 22e64f8..6458b6e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -235,8 +235,8 @@ source "package/fis/Config.in"
source "package/fmtools/Config.in"
source "package/fxload/Config.in"
source "package/gadgetfs-test/Config.in"
-source "package/gdisk/Config.in"
source "package/gpsd/Config.in"
+source "package/gptfdisk/Config.in"
source "package/gvfs/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/hdparm/Config.in"
diff --git a/package/gdisk/Config.in b/package/gdisk/Config.in
deleted file mode 100644
index 24d305d..0000000
--- a/package/gdisk/Config.in
+++ /dev/null
@@ -1,36 +0,0 @@
-config BR2_PACKAGE_GDISK
- bool "gdisk"
- depends on BR2_LARGEFILE
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR # util-linux
- help
- GPT fdisk (consisting of the gdisk and sgdisk programs) is a
- text-mode partitioning tool that works on Globally Unique Identifier
- (GUID) Partition Table (GPT) disks, rather than on the more common
- (through 2010) Master Boot Record (MBR) partition tables.
-
- http://www.rodsbooks.com/gdisk/
-
-config BR2_PACKAGE_GDISK_GDISK
- bool "interactive gdisk"
- depends on BR2_PACKAGE_GDISK
- select BR2_PACKAGE_UTIL_LINUX
- select BR2_PACKAGE_UTIL_LINUX_LIBUUID
- help
- Install the interactive GUID partition table (GPT) manipulator
- /usr/sbin/gdisk which is modelled after and quite similar in use
- to the traditional MBR based fdisk tool.
-
-config BR2_PACKAGE_GDISK_SGDISK
- bool "command line sgdisk"
- depends on BR2_PACKAGE_GDISK
- select BR2_PACKAGE_UTIL_LINUX
- select BR2_PACKAGE_UTIL_LINUX_LIBUUID
- select BR2_PACKAGE_POPT
- help
- Install the command-line GUID partition table (GPT) manipulator
- /usr/sbin/sgdisk which is named after the traditional MBR based
- sfdisk tool albeit with an entirely different option syntax.
-
-comment "gdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
- depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
diff --git a/package/gdisk/gdisk-001-no-utf16.patch b/package/gdisk/gdisk-001-no-utf16.patch
deleted file mode 100644
index 540e741..0000000
--- a/package/gdisk/gdisk-001-no-utf16.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-[PATCH] Disable UTF16 support
-
-libicu is quite large, and unicode partition names are uncommon.
-
-Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
----
-diff -ur gdisk-0.8.5/Makefile gptfdisk-0.8.5/Makefile
---- gdisk-0.8.5/Makefile 2012-05-30 08:38:43.000000000 -0700
-+++ gptfdisk-0.8.5/Makefile 2012-06-05 11:38:23.710597974 -0700
-@@ -1,8 +1,8 @@
- CC=gcc
- CXX=g++
- CFLAGS+=-D_FILE_OFFSET_BITS=64
--CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
--#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
-+#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
-+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
- LDFLAGS+=
- LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
- MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
-@@ -14,16 +14,16 @@
- all: cgdisk gdisk sgdisk fixparts
-
- gdisk: $(LIB_OBJS) gdisk.o gpttext.o
--# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
-- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
-+ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
-+# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
-
- cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
--# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
-- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
-+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
-+# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
-
- sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
--# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
-- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
-+ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
-+# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
-
- fixparts: $(MBR_LIB_OBJS) fixparts.o
- $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/package/gdisk/gdisk.mk b/package/gdisk/gdisk.mk
deleted file mode 100644
index cda369e..0000000
--- a/package/gdisk/gdisk.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################
-#
-# gdisk
-#
-#############################################################
-
-GDISK_VERSION = 0.8.6
-GDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
-GDISK_SOURCE = gptfdisk-$(GDISK_VERSION).tar.gz
-
-GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk
-GDISK_TARGETS_$(BR2_PACKAGE_GDISK_SGDISK) += sgdisk
-
-ifneq ($(GDISK_TARGETS_y),)
-
-GDISK_DEPENDENCIES += util-linux
-ifeq ($(BR2_PACKAGE_GDISK_SGDISK),y)
- GDISK_DEPENDENCIES += popt
-endif
-
-
-define GDISK_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
- -C $(@D) $(GDISK_TARGETS_y)
-endef
-
-define GDISK_INSTALL_TARGET_CMDS
- for i in $(GDISK_TARGETS_y); do \
- $(INSTALL) -D $(@D)/$$i $(TARGET_DIR)/usr/sbin/; \
- done
-endef
-
-define GDISK_UNINSTALL_TARGET_CMDS
- rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GDISK_TARGETS_y))
-endef
-
-endif
-
-$(eval $(generic-package))
diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
new file mode 100644
index 0000000..7851dc3
--- /dev/null
+++ b/package/gptfdisk/Config.in
@@ -0,0 +1,36 @@
+config BR2_PACKAGE_GPTFDISK
+ bool "gptfdisk"
+ depends on BR2_LARGEFILE
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_USE_WCHAR # util-linux
+ help
+ GPT fdisk (consisting of the gdisk and sgdisk programs) is a
+ text-mode partitioning tool that works on Globally Unique Identifier
+ (GUID) Partition Table (GPT) disks, rather than on the more common
+ (through 2010) Master Boot Record (MBR) partition tables.
+
+ http://www.rodsbooks.com/gdisk/
+
+config BR2_PACKAGE_GPTFDISK_GDISK
+ bool "interactive gdisk"
+ depends on BR2_PACKAGE_GPTFDISK
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ help
+ Install the interactive GUID partition table (GPT) manipulator
+ /usr/sbin/gdisk which is modelled after and quite similar in use
+ to the traditional MBR based fdisk tool.
+
+config BR2_PACKAGE_GPTFDISK_SGDISK
+ bool "command line sgdisk"
+ depends on BR2_PACKAGE_GPTFDISK
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+ select BR2_PACKAGE_POPT
+ help
+ Install the command-line GUID partition table (GPT) manipulator
+ /usr/sbin/sgdisk which is named after the traditional MBR based
+ sfdisk tool albeit with an entirely different option syntax.
+
+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-001-no-utf16.patch b/package/gptfdisk/gptfdisk-001-no-utf16.patch
new file mode 100644
index 0000000..540e741
--- /dev/null
+++ b/package/gptfdisk/gptfdisk-001-no-utf16.patch
@@ -0,0 +1,43 @@
+[PATCH] Disable UTF16 support
+
+libicu is quite large, and unicode partition names are uncommon.
+
+Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
+---
+diff -ur gdisk-0.8.5/Makefile gptfdisk-0.8.5/Makefile
+--- gdisk-0.8.5/Makefile 2012-05-30 08:38:43.000000000 -0700
++++ gptfdisk-0.8.5/Makefile 2012-06-05 11:38:23.710597974 -0700
+@@ -1,8 +1,8 @@
+ CC=gcc
+ CXX=g++
+ CFLAGS+=-D_FILE_OFFSET_BITS=64
+-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
+ LDFLAGS+=
+ LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
+ MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
+@@ -14,16 +14,16 @@
+ all: cgdisk gdisk sgdisk fixparts
+
+ gdisk: $(LIB_OBJS) gdisk.o gpttext.o
+-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
+- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
++# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
+
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
+- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
++# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
+
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
+- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
++# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
+
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
new file mode 100644
index 0000000..7755a30
--- /dev/null
+++ b/package/gptfdisk/gptfdisk.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# gptfdisk
+#
+#############################################################
+
+GPTFDISK_VERSION = 0.8.6
+GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
+
+GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk
+GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk
+
+ifneq ($(GPTFDISK_TARGETS_y),)
+
+GPTFDISK_DEPENDENCIES += util-linux
+ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
+ GPTFDISK_DEPENDENCIES += popt
+endif
+
+
+define GPTFDISK_BUILD_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
+ -C $(@D) $(GPTFDISK_TARGETS_y)
+endef
+
+define GPTFDISK_INSTALL_TARGET_CMDS
+ for i in $(GPTFDISK_TARGETS_y); do \
+ $(INSTALL) -D $(@D)/$$i $(TARGET_DIR)/usr/sbin/; \
+ done
+endef
+
+define GPTFDISK_UNINSTALL_TARGET_CMDS
+ rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GPTFDISK_TARGETS_y))
+endef
+
+endif
+
+$(eval $(generic-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 3/8] gptfdisk: ensure that the package always builds/installs something
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
2013-03-07 20:45 ` [Buildroot] [PATCH v2 1/8] gdisk: Update gdisk (gptfdisk) to version 0.8.6 Thomas Petazzoni
2013-03-07 20:45 ` [Buildroot] [PATCH v2 2/8] gdisk: rename to gptfdisk Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:13 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 4/8] gptfdisk: use TARGET_CONFIGURE_OPTS properly, use TARGET_MAKE_ENV Thomas Petazzoni
` (4 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
Until now, selecting just the gptfdisk package would do something. If
wouldn't build anything at all, and wouldn't install anything. This is
rather odd.
So now, we ensure that at least one of the two tools that gptfdisk can
build and install is selected. This allows use to factorize a bit the
select of util-linux in Config.in, and remove the if condition in the
makefile that was preventing the package from being built if no tools
was selected.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gptfdisk/Config.in | 7 +++----
package/gptfdisk/gptfdisk.mk | 4 ----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 7851dc3..0d7e358 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -3,6 +3,9 @@ config BR2_PACKAGE_GPTFDISK
depends on BR2_LARGEFILE
depends on BR2_INSTALL_LIBSTDCPP
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
help
GPT fdisk (consisting of the gdisk and sgdisk programs) is a
text-mode partitioning tool that works on Globally Unique Identifier
@@ -14,8 +17,6 @@ config BR2_PACKAGE_GPTFDISK
config BR2_PACKAGE_GPTFDISK_GDISK
bool "interactive gdisk"
depends on BR2_PACKAGE_GPTFDISK
- select BR2_PACKAGE_UTIL_LINUX
- select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
Install the interactive GUID partition table (GPT) manipulator
/usr/sbin/gdisk which is modelled after and quite similar in use
@@ -24,8 +25,6 @@ config BR2_PACKAGE_GPTFDISK_GDISK
config BR2_PACKAGE_GPTFDISK_SGDISK
bool "command line sgdisk"
depends on BR2_PACKAGE_GPTFDISK
- select BR2_PACKAGE_UTIL_LINUX
- select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_POPT
help
Install the command-line GUID partition table (GPT) manipulator
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 7755a30..2d3cb1a 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -10,8 +10,6 @@ GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk
GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk
-ifneq ($(GPTFDISK_TARGETS_y),)
-
GPTFDISK_DEPENDENCIES += util-linux
ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
GPTFDISK_DEPENDENCIES += popt
@@ -33,6 +31,4 @@ define GPTFDISK_UNINSTALL_TARGET_CMDS
rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GPTFDISK_TARGETS_y))
endef
-endif
-
$(eval $(generic-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 4/8] gptfdisk: use TARGET_CONFIGURE_OPTS properly, use TARGET_MAKE_ENV
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
` (2 preceding siblings ...)
2013-03-07 20:45 ` [Buildroot] [PATCH v2 3/8] gptfdisk: ensure that the package always builds/installs something Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:22 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 5/8] gptfdisk: fix installation step Thomas Petazzoni
` (3 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
$(TARGET_CONFIGURE_OPTS) should be passed as $(MAKE) argument, not in
the environment. We can then remove the redefined CC and LD variables
that were useless. We also take this opportunity to pass
$(TARGET_MAKE_ENV) in the environment of make.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gptfdisk/gptfdisk.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 2d3cb1a..656a187 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -15,10 +15,9 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
GPTFDISK_DEPENDENCIES += popt
endif
-
define GPTFDISK_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
- -C $(@D) $(GPTFDISK_TARGETS_y)
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+ $(GPTFDISK_TARGETS_y)
endef
define GPTFDISK_INSTALL_TARGET_CMDS
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 5/8] gptfdisk: fix installation step
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
` (3 preceding siblings ...)
2013-03-07 20:45 ` [Buildroot] [PATCH v2 4/8] gptfdisk: use TARGET_CONFIGURE_OPTS properly, use TARGET_MAKE_ENV Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:23 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 6/8] gptfdisk: make utf16 support configurable Thomas Petazzoni
` (2 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
The installation step was not giving the full destination path even
though it was using -D, and it was forgetting to explicitly specify
the permissions of the file to install. This commit fixes both of
these minor issues.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gptfdisk/gptfdisk.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 656a187..988eecf 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -22,7 +22,7 @@ endef
define GPTFDISK_INSTALL_TARGET_CMDS
for i in $(GPTFDISK_TARGETS_y); do \
- $(INSTALL) -D $(@D)/$$i $(TARGET_DIR)/usr/sbin/; \
+ $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i; \
done
endef
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 6/8] gptfdisk: make utf16 support configurable
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
` (4 preceding siblings ...)
2013-03-07 20:45 ` [Buildroot] [PATCH v2 5/8] gptfdisk: fix installation step Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:26 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 7/8] gptfdisk: add support for building and install cgdisk Thomas Petazzoni
2013-03-07 20:45 ` [Buildroot] [PATCH v2 8/8] gptfdisk: factorize the BR2_PACKAGE_GPTFDISK dependency Thomas Petazzoni
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
Instead of always disabling the UTF16 support, make it
configurable. When ICU is available, enable UTF16 support, otherwise
disable it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../gptfdisk-001-configurable-utf16-support.patch | 48 ++++++++++++++++++++
package/gptfdisk/gptfdisk-001-no-utf16.patch | 43 ------------------
package/gptfdisk/gptfdisk.mk | 9 +++-
3 files changed, 55 insertions(+), 45 deletions(-)
create mode 100644 package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
delete mode 100644 package/gptfdisk/gptfdisk-001-no-utf16.patch
diff --git a/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
new file mode 100644
index 0000000..2d51e6f
--- /dev/null
+++ b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
@@ -0,0 +1,48 @@
+[PATCH] Make the UTF16 support configurable
+
+libicu is quite large, and unicode partition names are uncommon, so we
+may not necessarily want to have UTF16 support unconditionnally. This
+patch adds a USE_UTF16 environment variable to tell whether we want
+the UTF16 support or not.
+
+Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,11 @@
+ CC=gcc
+ CXX=g++
+ CFLAGS+=-D_FILE_OFFSET_BITS=64
+-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++ifeq ($(USE_UTF16),y)
++CXXFLAGS+=-D USE_UTF16
++UTF16_LIBS=-licuio -licuuc
++endif
+ LDFLAGS+=
+ LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
+ MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
+@@ -14,16 +17,13 @@
+ all: cgdisk gdisk sgdisk fixparts
+
+ gdisk: $(LIB_OBJS) gdisk.o gpttext.o
+-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
+- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(UTF16_LIBS) -luuid -o gdisk
+
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
+- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lncurses -o cgdisk
+
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
+- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lpopt -o sgdisk
+
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/package/gptfdisk/gptfdisk-001-no-utf16.patch b/package/gptfdisk/gptfdisk-001-no-utf16.patch
deleted file mode 100644
index 540e741..0000000
--- a/package/gptfdisk/gptfdisk-001-no-utf16.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-[PATCH] Disable UTF16 support
-
-libicu is quite large, and unicode partition names are uncommon.
-
-Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
----
-diff -ur gdisk-0.8.5/Makefile gptfdisk-0.8.5/Makefile
---- gdisk-0.8.5/Makefile 2012-05-30 08:38:43.000000000 -0700
-+++ gptfdisk-0.8.5/Makefile 2012-06-05 11:38:23.710597974 -0700
-@@ -1,8 +1,8 @@
- CC=gcc
- CXX=g++
- CFLAGS+=-D_FILE_OFFSET_BITS=64
--CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
--#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
-+#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
-+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
- LDFLAGS+=
- LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
- MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
-@@ -14,16 +14,16 @@
- all: cgdisk gdisk sgdisk fixparts
-
- gdisk: $(LIB_OBJS) gdisk.o gpttext.o
--# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
-- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
-+ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
-+# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
-
- cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
--# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
-- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
-+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
-+# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
-
- sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
--# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
-- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
-+ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
-+# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
-
- fixparts: $(MBR_LIB_OBJS) fixparts.o
- $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 988eecf..884edf4 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -15,9 +15,14 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y)
GPTFDISK_DEPENDENCIES += popt
endif
+ifeq ($(BR2_PACKAGE_ICU),y)
+ GPTFDISK_DEPENDENCIES += icu
+ GPTFDISK_MAKE_OPTS += USE_UTF16=y
+endif
+
define GPTFDISK_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
- $(GPTFDISK_TARGETS_y)
+ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(GPTFDISK_MAKE_OPTS) \
+ -C $(@D) $(GPTFDISK_TARGETS_y)
endef
define GPTFDISK_INSTALL_TARGET_CMDS
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 7/8] gptfdisk: add support for building and install cgdisk
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
` (5 preceding siblings ...)
2013-03-07 20:45 ` [Buildroot] [PATCH v2 6/8] gptfdisk: make utf16 support configurable Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:32 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 8/8] gptfdisk: factorize the BR2_PACKAGE_GPTFDISK dependency Thomas Petazzoni
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
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(+)
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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 8/8] gptfdisk: factorize the BR2_PACKAGE_GPTFDISK dependency
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
` (6 preceding siblings ...)
2013-03-07 20:45 ` [Buildroot] [PATCH v2 7/8] gptfdisk: add support for building and install cgdisk Thomas Petazzoni
@ 2013-03-07 20:45 ` Thomas Petazzoni
2013-03-10 21:32 ` Peter Korsgaard
7 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2013-03-07 20:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gptfdisk/Config.in | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 1cdd8eb..1b0639d 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -1,3 +1,6 @@
+comment "gptfdisk requires a toolchain with LARGEFILE/WCHAR/C++ support enabled"
+ depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
+
config BR2_PACKAGE_GPTFDISK
bool "gptfdisk"
depends on BR2_LARGEFILE
@@ -14,9 +17,10 @@ config BR2_PACKAGE_GPTFDISK
http://www.rodsbooks.com/gdisk/
+if BR2_PACKAGE_GPTFDISK
+
config BR2_PACKAGE_GPTFDISK_GDISK
bool "interactive gdisk"
- depends on BR2_PACKAGE_GPTFDISK
help
Install the interactive GUID partition table (GPT) manipulator
/usr/sbin/gdisk which is modelled after and quite similar in use
@@ -24,7 +28,6 @@ config BR2_PACKAGE_GPTFDISK_GDISK
config BR2_PACKAGE_GPTFDISK_SGDISK
bool "command line sgdisk"
- depends on BR2_PACKAGE_GPTFDISK
select BR2_PACKAGE_POPT
help
Install the command-line GUID partition table (GPT) manipulator
@@ -33,11 +36,9 @@ config BR2_PACKAGE_GPTFDISK_SGDISK
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)
+endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 1/8] gdisk: Update gdisk (gptfdisk) to version 0.8.6
2013-03-07 20:45 ` [Buildroot] [PATCH v2 1/8] gdisk: Update gdisk (gptfdisk) to version 0.8.6 Thomas Petazzoni
@ 2013-03-10 21:06 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:06 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Justin Maggard <jmaggard10@gmail.com>
Thomas> [Thomas Petazzoni: bump to 0.8.6 and not 0.8.5]
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 2/8] gdisk: rename to gptfdisk
2013-03-07 20:45 ` [Buildroot] [PATCH v2 2/8] gdisk: rename to gptfdisk Thomas Petazzoni
@ 2013-03-10 21:07 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:07 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> In order to match the new upstream name, rename the gdisk package to
Thomas> gptfdisk. We add the relevant legacy configuration options to ensure a
Thomas> smooth transition for users.
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> +#
Thomas> +# Legacy options since 2013.02
Thomas> +#
Thomas> +
Thomas> +config BR2_PACKAGE_GDISK
Thomas> + bool "gdisk has been replaced by gptfdisk"
Thomas> + select BR2_LEGACY
Thomas> + select BR2_PACKAGE_GPTFDISK
Thomas> + help
Thomas> + The option has been renamed BR2_PACKAGE_GPTFDISK.
Thomas> +
Thomas> +config BR2_PACKAGE_GDISK_GDISK
Thomas> + bool "gdisk tool from gdisk has been replaced by gdisk in gptfdisk"
Thomas> + select BR2_LEGACY
Thomas> + select BR2_PACKAGE_GPTFDISK
Thomas> + select BR2_PACKAGE_GPTFDISK_GDISK
Thomas> + help
Thomas> + The option has been renamed BR2_PACKAGE_GPTFDISK_GDISK.
Thomas> +
Thomas> +config BR2_PACKAGE_GDISK_SGDISK
Thomas> + bool "sgdisk tool from gdisk has been replaced by sgdisk in gptfdisk"
Thomas> + select BR2_LEGACY
Thomas> + select BR2_PACKAGE_GPTFDISK
Thomas> + select BR2_PACKAGE_GPTFDISK_SGDISK
Thomas> + help
Thomas> + The option has been renamed BR2_PACKAGE_GPTFDISK_SGDISK.
The indentation of the 'bool' lines is wrong (spaces vs tabs). Committed
with that fixed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 3/8] gptfdisk: ensure that the package always builds/installs something
2013-03-07 20:45 ` [Buildroot] [PATCH v2 3/8] gptfdisk: ensure that the package always builds/installs something Thomas Petazzoni
@ 2013-03-10 21:13 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:13 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Until now, selecting just the gptfdisk package would do
Thomas> something. If wouldn't build anything at all, and wouldn't
Thomas> install anything. This is rather odd.
This sounds odd to me. You meant to say that it didn't do anything if
none of the sub options were selected, right?
Committed with some tweaks to the commit message, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 4/8] gptfdisk: use TARGET_CONFIGURE_OPTS properly, use TARGET_MAKE_ENV
2013-03-07 20:45 ` [Buildroot] [PATCH v2 4/8] gptfdisk: use TARGET_CONFIGURE_OPTS properly, use TARGET_MAKE_ENV Thomas Petazzoni
@ 2013-03-10 21:22 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:22 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> $(TARGET_CONFIGURE_OPTS) should be passed as $(MAKE) argument, not in
Thomas> the environment. We can then remove the redefined CC and LD variables
Thomas> that were useless. We also take this opportunity to pass
Thomas> $(TARGET_MAKE_ENV) in the environment of make.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 5/8] gptfdisk: fix installation step
2013-03-07 20:45 ` [Buildroot] [PATCH v2 5/8] gptfdisk: fix installation step Thomas Petazzoni
@ 2013-03-10 21:23 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:23 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The installation step was not giving the full destination path even
Thomas> though it was using -D, and it was forgetting to explicitly specify
Thomas> the permissions of the file to install. This commit fixes both of
Thomas> these minor issues.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 6/8] gptfdisk: make utf16 support configurable
2013-03-07 20:45 ` [Buildroot] [PATCH v2 6/8] gptfdisk: make utf16 support configurable Thomas Petazzoni
@ 2013-03-10 21:26 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:26 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Instead of always disabling the UTF16 support, make it
Thomas> configurable. When ICU is available, enable UTF16 support, otherwise
Thomas> disable it.
Thomas> diff --git a/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
Thomas> new file mode 100644
Thomas> index 0000000..2d51e6f
Thomas> --- /dev/null
Thomas> +++ b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch
Thomas> @@ -0,0 +1,48 @@
Thomas> +[PATCH] Make the UTF16 support configurable
Thomas> +
Thomas> +libicu is quite large, and unicode partition names are uncommon, so we
Thomas> +may not necessarily want to have UTF16 support unconditionnally. This
Thomas> +patch adds a USE_UTF16 environment variable to tell whether we want
Thomas> +the UTF16 support or not.
Thomas> +
Thomas> +Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
Thomas> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Please consider sending this upstream.
Thomas> define GPTFDISK_BUILD_CMDS
Thomas> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
Thomas> - $(GPTFDISK_TARGETS_y)
Thomas> + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(GPTFDISK_MAKE_OPTS) \
Thomas> + -C $(@D) $(GPTFDISK_TARGETS_y)
Thomas> endef
Instead of this long line I moved the _MAKE_OPTS into the 2nd line.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 7/8] gptfdisk: add support for building and install cgdisk
2013-03-07 20:45 ` [Buildroot] [PATCH v2 7/8] gptfdisk: add support for building and install cgdisk Thomas Petazzoni
@ 2013-03-10 21:32 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:32 UTC (permalink / raw)
To: buildroot
>>>>> "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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 8/8] gptfdisk: factorize the BR2_PACKAGE_GPTFDISK dependency
2013-03-07 20:45 ` [Buildroot] [PATCH v2 8/8] gptfdisk: factorize the BR2_PACKAGE_GPTFDISK dependency Thomas Petazzoni
@ 2013-03-10 21:32 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2013-03-10 21:32 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2013-03-10 21:32 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-07 20:45 [Buildroot] [PATCH v2 0/8] Bump and improve gdisk/gptfdisk packaging Thomas Petazzoni
2013-03-07 20:45 ` [Buildroot] [PATCH v2 1/8] gdisk: Update gdisk (gptfdisk) to version 0.8.6 Thomas Petazzoni
2013-03-10 21:06 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 2/8] gdisk: rename to gptfdisk Thomas Petazzoni
2013-03-10 21:07 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 3/8] gptfdisk: ensure that the package always builds/installs something Thomas Petazzoni
2013-03-10 21:13 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 4/8] gptfdisk: use TARGET_CONFIGURE_OPTS properly, use TARGET_MAKE_ENV Thomas Petazzoni
2013-03-10 21:22 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 5/8] gptfdisk: fix installation step Thomas Petazzoni
2013-03-10 21:23 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 6/8] gptfdisk: make utf16 support configurable Thomas Petazzoni
2013-03-10 21:26 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 7/8] gptfdisk: add support for building and install cgdisk Thomas Petazzoni
2013-03-10 21:32 ` Peter Korsgaard
2013-03-07 20:45 ` [Buildroot] [PATCH v2 8/8] gptfdisk: factorize the BR2_PACKAGE_GPTFDISK dependency Thomas Petazzoni
2013-03-10 21:32 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.