NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdisk: Update gdisk (gptfdisk) to version 0.8.6

Browse Source 
[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>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Justin Maggard 2013-03-07 10:45:23 +00:00 committed by Peter Korsgaard
parent df99efb3d9
commit 7cbb30115b
4 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/gdisk/gdisk-0.6.14-unistd.patch
View File

@ -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"

22
package/gdisk/gdisk-0.6.14-uuid.h.patch
View File

@ -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

43
package/gdisk/gdisk-001-no-utf16.patch Normal file
View File

@ -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

6
package/gdisk/gdisk.mk
View File

@ -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