diff options
Diffstat (limited to 'system/gpart')
| -rw-r--r-- | system/gpart/README | 2 | ||||
| -rw-r--r-- | system/gpart/docdir.diff.gz | bin | 0 -> 221 bytes | |||
| -rw-r--r-- | system/gpart/gpart.SlackBuild | 17 | ||||
| -rw-r--r-- | system/gpart/lvm2-btrfs.diff.gz | bin | 0 -> 245 bytes |
4 files changed, 12 insertions, 7 deletions
diff --git a/system/gpart/README b/system/gpart/README index 8e009c99020f9..3cdde883077fe 100644 --- a/system/gpart/README +++ b/system/gpart/README @@ -9,4 +9,4 @@ filesystem guessing modules are built in. Supported (guessable) filesystem or partition types: DOS/Windows FAT, Linux ext2 and swap, OS/2 HPFS, Windows NTFS, FreeBSD and Solaris/x86 disklabels, Minix FS, QNX 4 FS, Reiser FS, -LVM physical volumes, BeOS FS, SGI XFS. +LVM and LVM2 physical volumes, BTRFS, BeOS FS, SGI XFS. diff --git a/system/gpart/docdir.diff.gz b/system/gpart/docdir.diff.gz Binary files differnew file mode 100644 index 0000000000000..6dfbdd52dad63 --- /dev/null +++ b/system/gpart/docdir.diff.gz diff --git a/system/gpart/gpart.SlackBuild b/system/gpart/gpart.SlackBuild index f3a2770ef4abf..14b7cd3953cd8 100644 --- a/system/gpart/gpart.SlackBuild +++ b/system/gpart/gpart.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gpart VERSION=${VERSION:-0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,6 +69,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Add LVM2 and btrfs to list of supported modules +# https://github.com/baruch/gpart/commit/610741608381635064c15030f35714dd113f76af +zcat $CWD/lvm2-btrfs.diff.gz | patch -p1 + +# Respect configure --docdir option +# https://github.com/baruch/gpart/commit/5fa7b6f405ae651af06a50e85c80cc2a76116538 +zcat $CWD/docdir.diff.gz | patch -p1 + # generate the configure file sed '/configure/d' -i autogen.sh ./autogen.sh @@ -78,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --datarootdir=/usr/share \ --mandir=/usr/man \ - --datadir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux make @@ -90,9 +98,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -# don't need this -rm -rf $PKG/usr/doc/${PRGNAM}-$VERSION/doc - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING Changes INSTALL LSM README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/gpart/lvm2-btrfs.diff.gz b/system/gpart/lvm2-btrfs.diff.gz Binary files differnew file mode 100644 index 0000000000000..d45dcae710d27 --- /dev/null +++ b/system/gpart/lvm2-btrfs.diff.gz |