From patchwork Wed Jun 13 22:20:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Maggard X-Patchwork-Id: 164770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 68EC5B7008 for ; Thu, 14 Jun 2012 08:21:29 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 21FD9A0347; Wed, 13 Jun 2012 22:21:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 95vmfKkU86Xt; Wed, 13 Jun 2012 22:21:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4FABEA001C; Wed, 13 Jun 2012 22:21:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 17C728F792 for ; Wed, 13 Jun 2012 22:21:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0A0EC101E2D for ; Wed, 13 Jun 2012 22:21:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VZHis6oWaacc for ; Wed, 13 Jun 2012 22:21:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pz0-f46.google.com (mail-pz0-f46.google.com [209.85.210.46]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 04CA2101DFE for ; Wed, 13 Jun 2012 22:21:22 +0000 (UTC) Received: by dady13 with SMTP id y13so1631305dad.33 for ; Wed, 13 Jun 2012 15:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=TB/Ugv9ejtNtieDhLpuVEMOZ+If+DWtLzSzbEE1JpzU=; b=js7A6JLneUQyc4zNeGfD6a6DwlMcKH2ifX3q5kL3DC5HE23Y4b/BzC0RZs6dazOztD s74lB4ZQuDUkEOk+SxXi9P2jan7AUORAbx56Bhl62mkyDg1HwIMSfCetBOyKdsHR2DA4 Xqj+14ouRqdjFdrtF9TKKiSA+uxvhL1euhzOdzn0ADqj86Gs4Kq6jfzlCzqJmUqm8BrE vqknZchrb61TIpDUhi3vc29NLQRTCJU/QH/ysIY0kXRKa7OAXlPtwVh+cWqtl5n7WGV2 ILxgU7mcVeHCO8iL7kTTsfsRAY7HTfhq6zCip1eoPVD18dmaWq5raWvh+Ay8kynTurUB ORmQ== Received: by 10.68.228.130 with SMTP id si2mr485606pbc.59.1339626082662; Wed, 13 Jun 2012 15:21:22 -0700 (PDT) Received: from localhost.localdomain ([209.249.181.1]) by mx.google.com with ESMTPS id og4sm7116075pbb.48.2012.06.13.15.21.20 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Jun 2012 15:21:21 -0700 (PDT) From: Justin Maggard To: buildroot@uclibc.org Date: Wed, 13 Jun 2012 15:20:43 -0700 Message-Id: <1339626043-11946-1-git-send-email-jmaggard10@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH v2] Update gdisk (gptfdisk) to version 0.8.5. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Update GPT fdisk utility to upstream version 0.8.5. Signed-off-by: Justin Maggard --- package/gdisk/gdisk-0.6.14-uuid.h.patch | 22 ------------------ package/gdisk/gdisk-0.8.5-no-utf16.patch | 43 ++++++++++++++++++++++++++++++++++++ package/gdisk/gdisk.mk | 4 ++-- 3 files changed, 45 insertions(+), 24 deletions(-) delete mode 100644 package/gdisk/gdisk-0.6.14-uuid.h.patch create mode 100644 package/gdisk/gdisk-0.8.5-no-utf16.patch 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 ---- - 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 -+#include - typedef uuid_t my_uuid_t; - #endif - diff --git a/package/gdisk/gdisk-0.8.5-no-utf16.patch b/package/gdisk/gdisk-0.8.5-no-utf16.patch new file mode 100644 index 0000000..54e55f6 --- /dev/null +++ b/package/gdisk/gdisk-0.8.5-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 +--- +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 a53ee83..619a32d 100644 --- a/package/gdisk/gdisk.mk +++ b/package/gdisk/gdisk.mk @@ -4,9 +4,9 @@ # ############################################################# -GDISK_VERSION = 0.6.14 +GDISK_VERSION = 0.8.5 GDISK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gptfdisk -GDISK_SOURCE = gdisk-$(GDISK_VERSION).tgz +GDISK_SOURCE = gptfdisk-$(GDISK_VERSION).tar.gz GDISK_TARGETS_$(BR2_PACKAGE_GDISK_GDISK) += gdisk GDISK_TARGETS_$(BR2_PACKAGE_GDISK_SGDISK) += sgdisk