Browse code
Updating gptfdisk
Change-Id: I8f24d6ea300cb99d202c98ce173ebd9b944b6037
Reviewed-on: http://photon-jenkins.eng.vmware.com/581
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
Kumar Kaushik authored on 2016/02/27 09:40:03Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,87 @@ |
| 0 |
+Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> |
|
| 1 |
+Date: 2015-10-19 |
|
| 2 |
+Initial Package Version: 1.0.1 |
|
| 3 |
+Upstream Status: None. BLFS specific. |
|
| 4 |
+Origin: BLFS |
|
| 5 |
+Description: Updates Makefile enabling parameter passing. |
|
| 6 |
+ Rediffed for version 1.0.1 |
|
| 7 |
+ |
|
| 8 |
+--- gptfdisk-1.0.1/Makefile 2015-10-18 17:35:18.000000000 -0500 |
|
| 9 |
+@@ -1,29 +1,39 @@ |
|
| 10 |
+-CC=gcc |
|
| 11 |
+-CXX=g++ |
|
| 12 |
+-CFLAGS+=-D_FILE_OFFSET_BITS=64 |
|
| 13 |
+-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 |
|
| 14 |
+-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 |
|
| 15 |
+-LDFLAGS+= |
|
| 16 |
+-LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix |
|
| 17 |
+-MBR_LIBS=support diskio diskio-unix basicmbr mbrpart |
|
| 18 |
+-LIB_OBJS=$(LIB_NAMES:=.o) |
|
| 19 |
+-MBR_LIB_OBJS=$(MBR_LIBS:=.o) |
|
| 20 |
+-LIB_HEADERS=$(LIB_NAMES:=.h) |
|
| 21 |
+-DEPEND= makedepend $(CXXFLAGS) |
|
| 22 |
++ifdef ICU |
|
| 23 |
++ USE_ICU = -DUSE_UTF16 |
|
| 24 |
++ EXTRA_LIBS = -licuio -licuuc |
|
| 25 |
++endif |
|
| 26 |
++ |
|
| 27 |
++ifdef POPT |
|
| 28 |
++ EXTRA_LIBS += -lpopt |
|
| 29 |
++ SGDISK = sgdisk |
|
| 30 |
++endif |
|
| 31 |
++ |
|
| 32 |
++CC = gcc |
|
| 33 |
++CXX = g++ |
|
| 34 |
++CFLAGS += -D_FILE_OFFSET_BITS=64 |
|
| 35 |
++CXXFLAGS += -Wall -D_FILE_OFFSET_BITS=64 $(USE_ICU) |
|
| 36 |
++ |
|
| 37 |
++LDFLAGS += |
|
| 38 |
++LIB_NAMES = crc32 support guid gptpart mbrpart basicmbr mbr \ |
|
| 39 |
++ gpt bsd parttypes attributes diskio diskio-unix |
|
| 40 |
++LIB_OBJS = $(LIB_NAMES:=.o) |
|
| 41 |
++LIB_HEADERS = $(LIB_NAMES:=.h) |
|
| 42 |
+ |
|
| 43 |
+-all: cgdisk gdisk sgdisk fixparts |
|
| 44 |
++MBR_LIBS = support diskio diskio-unix basicmbr mbrpart |
|
| 45 |
++MBR_LIB_OBJS = $(MBR_LIBS:=.o) |
|
| 46 |
++ |
|
| 47 |
++DEPEND = makedepend $(CXXFLAGS) |
|
| 48 |
++ |
|
| 49 |
++all: cgdisk gdisk fixparts $(SGDISK) |
|
| 50 |
+ |
|
| 51 |
+ gdisk: $(LIB_OBJS) gdisk.o gpttext.o |
|
| 52 |
+- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk |
|
| 53 |
+-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk |
|
| 54 |
++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(EXTRA_LIBS) -luuid -o gdisk |
|
| 55 |
+ |
|
| 56 |
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o |
|
| 57 |
+- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw -o cgdisk |
|
| 58 |
+-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk |
|
| 59 |
++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) $(EXTRA_LIBS) -luuid -lncursesw -o cgdisk |
|
| 60 |
+ |
|
| 61 |
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o |
|
| 62 |
+- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk |
|
| 63 |
+-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk |
|
| 64 |
++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(EXTRA_LIBS) -luuid -lpopt -o sgdisk |
|
| 65 |
+ |
|
| 66 |
+ fixparts: $(MBR_LIB_OBJS) fixparts.o |
|
| 67 |
+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts |
|
| 68 |
+@@ -37,6 +47,12 @@ |
|
| 69 |
+ clean: #no pre-reqs |
|
| 70 |
+ rm -f core *.o *~ gdisk sgdisk cgdisk fixparts |
|
| 71 |
+ |
|
| 72 |
++install: all |
|
| 73 |
++ mkdir -p $(DESTDIR)/sbin $(DESTDIR)/usr/share/man/man8 |
|
| 74 |
++ cp gdisk cgdisk fixparts $(SGDISK) $(DESTDIR)/sbin |
|
| 75 |
++ cp *.8 $(DESTDIR)/usr/share/man/man8 |
|
| 76 |
++ |
|
| 77 |
++ |
|
| 78 |
+ # what are the source dependencies |
|
| 79 |
+ depend: $(SRCS) |
|
| 80 |
+ $(DEPEND) $(SRCS) |
|
| 81 |
+@@ -44,4 +60,3 @@ |
|
| 82 |
+ $(OBJS): |
|
| 83 |
+ $(CRITICAL_CXX_FLAGS) |
|
| 84 |
+ |
|
| 85 |
+-# DO NOT DELETE |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 |
-Summary: gptfdisk-0.8.10 |
|
| 1 |
+Summary: gptfdisk-1.0.1 |
|
| 2 | 2 |
Name: gptfdisk |
| 3 |
-Version: 0.8.10 |
|
| 3 |
+Version: 1.0.1 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
URL: http://sourceforge.net/projects/gptfdisk/ |
| 7 | 7 |
Group: System Environment/Filesystem and Disk management |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 |
-Source0: http://downloads.sourceforge.net/project/gptfdisk/gptfdisk/0.8.10/gptfdisk-0.8.10.tar.gz |
|
| 11 |
-%define sha1 gptfdisk=1708e232220236b6bdf299b315e9bc2205c01ba5 |
|
| 12 |
-Patch0: http://www.linuxfromscratch.org/patches/blfs/systemd/gptfdisk-0.8.10-convenience-1.patch |
|
| 10 |
+Source0: http://downloads.sourceforge.net/project/gptfdisk/gptfdisk/1.0.1/gptfdisk-1.0.1.tar.gz |
|
| 11 |
+%define sha1 gptfdisk=ad28c511c642235815b83fffddf728c117057cba |
|
| 12 |
+Patch0: gptfdisk-1.0.1-convenience-1.patch |
|
| 13 | 13 |
Requires: popt >= 1.16 |
| 14 | 14 |
BuildRequires: popt-devel |
| 15 | 15 |
BuildRequires: ncurses-devel |
| ... | ... |
@@ -40,5 +40,7 @@ rm -rf %{buildroot}/*
|
| 40 | 40 |
/sbin/* |
| 41 | 41 |
%{_mandir}/man8/*
|
| 42 | 42 |
%changelog |
| 43 |
+* Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.1-1 |
|
| 44 |
+- Updated Version. |
|
| 43 | 45 |
* Thu Oct 30 2014 Divya Thaluru <dthaluru@vmware.com> 0.8.10-1 |
| 44 | 46 |
- Initial build. First version |