Skip to content

gptfdisk: Add version 1.0.1 #71

Merged
merged 1 commit into from Jul 27, 2016
Merged

gptfdisk: Add version 1.0.1 #71

merged 1 commit into from Jul 27, 2016

Conversation

thomas
Copy link
Collaborator

@thomas thomas commented Jul 25, 2016

No description provided.

@pmenzel
Copy link
Collaborator

pmenzel commented Jul 25, 2016

Could you please comment on why it’s needed to override certain default routines? Are these reported upstream already (if it’s still maintained)?

@thomas
Copy link
Collaborator Author

thomas commented Jul 25, 2016

Could you be a bit more specific, which routines are overriden needlessly?
Or is it just the missing make install from the developer?
And why bug people that write good software?

@pmenzel
Copy link
Collaborator

pmenzel commented Jul 25, 2016

Because with the changes below it still seems to build fine.

> git diff
diff --git a/gptfdisk.be0 b/gptfdisk.be0
index ea271c5..e33ec9a 100755
--- a/gptfdisk.be0
+++ b/gptfdisk.be0
@@ -6,17 +6,10 @@

 SRCURL[0]="http://www.rodsbooks.com/gdisk/gptfdisk-${PKGVERSION}.tar.gz"

-build_in_sourcedir
-BEE_BUILDTYPE="make"
-
 function mee_configure() {
   echo 'Nothing to configure'
 }

-function mee_build() {
-  CXXFLAGS+='-O' make
-}
-
 function mee_install() {
   for FILE in cgdisk fixparts gdisk sgdisk ; do
     install -D $FILE ${D}/usr/sbin/$FILE
> BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j' ./gptfdisk.be0
BEE v1.2.10 2009-2016
  by  Marius Tolzmann <marius@mariux.de>
      Matthias Ruester <ruester@molgen.mpg.de>
      Tobias Dreyer <dreyer@molgen.mpg.de>

[BEE]   BEE_SKIPLIST           /etc/bee/skiplist
[BEE]   BEE_REPOSITORY_PREFIX  /home/pmenzel/.local/src/bee
[BEE]   BEE_METADIR            /home/pmenzel/.local/share/bee
[BEE]   BEE_TMP_TMPDIR         /dev/shm
[BEE]   BEE_TMP_BUILDROOT      /dev/shm/bee-root
[BEE] current working directory: /home/pmenzel/bee-files
[BEE] ==> initializing build environment ..
[BEE]  -> creating source dir /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/source
[BEE]  -> creating image dir /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/image
[BEE] ==> checking repositories ..
[BEE] ==> building gptfdisk-1.0.1-0.x86_64 ..
[BEE] => entering bee_getsources() ..
[BEE] fetching http://www.rodsbooks.com/gdisk/gptfdisk-1.0.1.tar.gz
--2016-07-25 18:22:03--  http://www.rodsbooks.com/gdisk/gptfdisk-1.0.1.tar.gz
Resolving www.rodsbooks.com (www.rodsbooks.com)... 67.210.120.45
Connecting to www.rodsbooks.com (www.rodsbooks.com)|67.210.120.45|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 195378 (191K) [application/x-gzip]
Saving to: ‘/dev/shm/bee-root/gptfdisk/files/gptfdisk-1.0.1.tar.gz’

/dev/shm/bee-root/gptfdisk/files/gptfdisk-1.0.1.tar.gz                                                    100%[=======================================================================================================================================================================================================================================================================================>] 190.80K   204KB/s   in 0.9s   

2016-07-25 18:22:05 (204 KB/s) - ‘/dev/shm/bee-root/gptfdisk/files/gptfdisk-1.0.1.tar.gz’ saved [195378/195378]

-rw-r--r-- 1 pmenzel pmenzel 195378 Oct 19  2015 /dev/shm/bee-root/gptfdisk/files/gptfdisk-1.0.1.tar.gz
[BEE] <= leaving bee_getsources() ..
[BEE] => entering bee_extract() ..
[BEE]  -> extracting main source /dev/shm/bee-root/gptfdisk/files/gptfdisk-1.0.1.tar.gz ..
[BEE] tar xof /dev/shm/bee-root/gptfdisk/files/gptfdisk-1.0.1.tar.gz -C /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/source --strip-components 1
[BEE]  -> all sources extracted to: /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/source ..
[BEE] <= leaving bee_extract() ..
[BEE] changing to source directory: /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/source
[BEE] => entering bee_patch() ..
[BEE] <= leaving bee_patch() ..
[BEE] using magic buildtype 'make' from '/usr/libexec/bee/beesh.d/make.sh' ..
[BEE]  -> B=S linking build dir /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/build to source dir
[BEE] changing to build directory: /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/source
[BEE] => entering mee_configure() ..
Nothing to configure
[BEE] <= leaving mee_configure() ..
[BEE] => entering bee_build() ..
[BEE] make -j PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR=/usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/gptfdisk
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o crc32.o crc32.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o support.o support.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o guid.o guid.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o gptpart.o gptpart.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o mbrpart.o mbrpart.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o basicmbr.o basicmbr.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o mbr.o mbr.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o gpt.o gpt.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o bsd.o bsd.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o parttypes.o parttypes.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o attributes.o attributes.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o diskio.o diskio.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o diskio-unix.o diskio-unix.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o cgdisk.o cgdisk.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o gptcurses.o gptcurses.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o gdisk.o gdisk.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o gpttext.o gpttext.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o sgdisk.o sgdisk.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o gptcl.o gptcl.cc
g++ -Wall -D_FILE_OFFSET_BITS=64   -c -o fixparts.o fixparts.cc
gptcurses.cc: In member function ‘void GPTDataCurses::SetAlignment()’:
gptcurses.cc:405:29: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings]
       scanw("%d", &alignment);
                             ^
g++ support.o diskio.o diskio-unix.o basicmbr.o mbrpart.o fixparts.o  -o fixparts
g++ crc32.o support.o guid.o gptpart.o mbrpart.o basicmbr.o mbr.o gpt.o bsd.o parttypes.o attributes.o diskio.o diskio-unix.o cgdisk.o gptcurses.o  -luuid -lncursesw -o cgdisk
g++ crc32.o support.o guid.o gptpart.o mbrpart.o basicmbr.o mbr.o gpt.o bsd.o parttypes.o attributes.o diskio.o diskio-unix.o gdisk.o gpttext.o  -luuid -o gdisk
g++ crc32.o support.o guid.o gptpart.o mbrpart.o basicmbr.o mbr.o gpt.o bsd.o parttypes.o attributes.o diskio.o diskio-unix.o sgdisk.o gptcl.o  -luuid -lpopt -o sgdisk
[BEE] <= leaving bee_build() ..
[BEE] => entering mee_install() ..
[BEE] <= leaving mee_install() ..
[BEE] changing to image directory: /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/image
[BEE] WARNING: system and image files named '/usr/man' differ
[BEE]          image : directory
[BEE]          system: symbolic link to `share/man'
[BEE]  -> creating package gptfdisk-1.0.1-0.x86_64.bee.tar.bz2 ..
[BEE] /home/pmenzel/.local/src/bee/packages/gptfdisk-1.0.1-0.x86_64.bee.tar.bz2
-rw-r--r-- pmenzel/pmenzel 1453 2016-07-25 18:22 CONTENT
-rwxr-x--- pmenzel/pmenzel  412 2016-07-25 18:22 BUILD
-rw-r--r-- pmenzel/pmenzel  438 2016-07-25 18:22 META
-rwxr-xr-x pmenzel/pmenzel 26880 2016-07-25 18:22 /usr/man/man8/sgdisk.8
-rwxr-xr-x pmenzel/pmenzel 28294 2016-07-25 18:22 /usr/man/man8/gdisk.8
-rwxr-xr-x pmenzel/pmenzel 10813 2016-07-25 18:22 /usr/man/man8/fixparts.8
-rwxr-xr-x pmenzel/pmenzel 15830 2016-07-25 18:22 /usr/man/man8/cgdisk.8
-rwxr-xr-x pmenzel/pmenzel 223368 2016-07-25 18:22 /usr/sbin/sgdisk
-rwxr-xr-x pmenzel/pmenzel 230560 2016-07-25 18:22 /usr/sbin/gdisk
-rwxr-xr-x pmenzel/pmenzel  94704 2016-07-25 18:22 /usr/sbin/fixparts
-rwxr-xr-x pmenzel/pmenzel 238600 2016-07-25 18:22 /usr/sbin/cgdisk
[BEE] -> saving bee-file gptfdisk.be0 ..
[BEE] /home/pmenzel/.local/src/bee/bee-files/gptfdisk-1.0.1-0.bee
‘/home/pmenzel/bee-files/./gptfdisk.be0’ -> ‘/home/pmenzel/.local/src/bee/bee-files/gptfdisk-1.0.1-0.bee’
[BEE]  -> saving build environment..
[BEE] /home/pmenzel/.local/src/bee/build-archives/gptfdisk-1.0.1-0.x86_64.beebuild.tar.bz2

[BEE] ===================================================================
[BEE] build summary:
[BEE]  
[BEE] download directory ${F}: /dev/shm/bee-root/gptfdisk/files
[BEE]   source directory ${S}: /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/source
[BEE]    build directory ${B}: /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/build
[BEE]    image directory ${D}: /dev/shm/bee-root/gptfdisk/gptfdisk-1.0.1-0/image
[BEE]  
[BEE]      bee-file: /home/pmenzel/.local/src/bee/bee-files/gptfdisk-1.0.1-0.bee
[BEE]      pkg-file: /home/pmenzel/.local/src/bee/packages/gptfdisk-1.0.1-0.x86_64.bee.tar.bz2
[BEE] build-archive: /home/pmenzel/.local/src/bee/build-archives/gptfdisk-1.0.1-0.x86_64.beebuild.tar.bz2
[BEE] ===================================================================

Or is it just the missing make install from the developer?
And why bug people that write good software?

In my opinion an install target belongs to good software.


function mee_install() {
for FILE in cgdisk fixparts gdisk sgdisk ; do
install -D $FILE ${D}/usr/sbin/$FILE
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don’t hardcode the paths.

SBINDIR=${EPREFIX}/sbin

@pmenzel
Copy link
Collaborator

pmenzel commented Jul 25, 2016

The file below (with the needed changes in the install target) builds just fine for me.

#!/bin/env beesh

# BEE_VERSION gptfdisk-1.0.1-0

# Mind: {F}:download, {S}:source, {B}:build, {D}:image

SRCURL[0]="http://www.rodsbooks.com/gdisk/gptfdisk-${PKGVERSION}.tar.gz"

function mee_install() {
  for FILE in cgdisk fixparts gdisk sgdisk ; do
    install -D $FILE ${D}/usr/sbin/$FILE
    install -D $FILE.8 ${D}/usr/man/man8/$FILE.8
  done
}

@thomas
Copy link
Collaborator Author

thomas commented Jul 26, 2016

So we have a nicer variant of the same thing (besides missing optimisation, which isn't that important for software that solely works with partition tables), so feel free to post your version.

gptfdisk (GPT fdisk utilities) [1]:

> GPT fdisk (consisting of the gdisk, cgdisk, sgdisk, and fixparts
> programs) is a set of text-mode partitioning tools for using a GPT
> (GUID Partition Table), rather than the traditional MBR (Master Boot
> Record) partition tables.  It features several partitioning tools,
> recovery tools to help you deal with corrupt partition tables, and the
> ability to convert MBR disks to GPT format.

There is no install make target, so implement that manually.

[1] https://sourceforge.net/projects/gptfdisk/

Improved-by: Paul Menzel <pmenzel@molgen.mpg.de>
@pmenzel pmenzel changed the title gptfdisk: add-gptfdisk.be0 (ver. 1.0.1) gptfdisk: Add version 1.0.1 Jul 27, 2016
@pmenzel pmenzel merged commit 804bf77 into master Jul 27, 2016
@pmenzel pmenzel deleted the add-gptfdisk.be0 branch July 27, 2016 15:15
@pmenzel
Copy link
Collaborator

pmenzel commented Jul 27, 2016

@thomas, I fixed the bee file up, and accepted the merge request. Also, I installed it on deinemuddah.

@thomas
Copy link
Collaborator Author

thomas commented Jul 27, 2016

merci!

donald added a commit that referenced this pull request Mar 21, 2018
Includes pull request mariux64/mxq/#72 for issue mariux64/mxq/#71
"mxqd starts user processes with SIGPIPE ignored"
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants