diff options
Diffstat (limited to 'source/a/e2fsprogs')
| -rw-r--r-- | source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign | bin | 543 -> 0 bytes | |||
| -rw-r--r-- | source/a/e2fsprogs/e2fsprogs-1.43.1.tar.sign | bin | 0 -> 287 bytes | |||
| -rwxr-xr-x | source/a/e2fsprogs/e2fsprogs.SlackBuild | 49 | ||||
| -rw-r--r-- | source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff | 12 | ||||
| -rw-r--r-- | source/a/e2fsprogs/slack-desc | 2 |
5 files changed, 48 insertions, 15 deletions
diff --git a/source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign Binary files differdeleted file mode 100644 index 660df333..00000000 --- a/source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign +++ /dev/null diff --git a/source/a/e2fsprogs/e2fsprogs-1.43.1.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.43.1.tar.sign Binary files differnew file mode 100644 index 00000000..362b4274 --- /dev/null +++ b/source/a/e2fsprogs/e2fsprogs-1.43.1.tar.sign diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index 51c268a1..d96c7193 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,9 @@ # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. +PKGNAM=e2fsprogs VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -32,7 +33,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -40,8 +41,8 @@ if [ -z "$ARCH" ]; then esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -79,6 +80,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Do not use 64-bit by default on ext4, since some bootloaders cannot handle +# it yet. But use "auto_64-bit_support = 1", which will enable 64-bit if the +# number of blocks for the file system requires the feature to be enabled. +zcat $CWD/e2fsprogs.no.64bit.by.default.diff.gz | patch -p1 --verbose || exit 1 + # Disable libblkid and libuuid, as we'll be using the ones in u-l-ng CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -106,12 +112,12 @@ make install-libs DESTDIR=$PKG || exit 1 # cat findsuper > $PKG/sbin/findsuper # chmod 0755 $PKG/sbin/findsuper ) -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - # Don't clobber an existing config file mv $PKG/etc/mke2fs.conf $PKG/etc/mke2fs.conf.new +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + # Fix up package: mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/lib${LIBDIRSUFFIX}/*.so \ @@ -152,6 +158,10 @@ EOF cp -a fsck.ext2 fsck.ext4 cp -a fsck.ext2 fsck.ext4dev ) +( cd $PKG/usr/man/man5 + ln -sf ext4.5 ext2.5 + ln -sf ext4.5 ext3.5 +) ( cd $PKG/usr/man/man8 rm -f fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \ mkfs.ext4.8 mkfs.ext4dev.8 @@ -165,18 +175,29 @@ EOF ln -sf mke2fs.8 mkfs.ext4dev.8 ) -# Compress and link manpages -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +# Compress manual pages: +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 mkdir -p $PKG/usr/doc/e2fsprogs-$VERSION cp -a \ - COPYING* INSTALL INSTALL.elfbin README* RELEASE-NOTES SHLIBS \ + COPYING* INSTALL* NOTICE README* RELEASE-NOTES SHLIBS SUBMITTING-PATCHES \ $PKG/usr/doc/e2fsprogs-$VERSION +cp -a ext2ed/COPYRIGHT $PKG/usr/doc/e2fsprogs-$VERSION/COPYRIGHT.ext2ed +cp -a ext2ed/README $PKG/usr/doc/e2fsprogs-$VERSION/README.ext2ed +cp -a lib/uuid/COPYING $PKG/usr/doc/e2fsprogs-$VERSION/COPYING.uuid chmod 644 $PKG/usr/doc/e2fsprogs-$VERSION/* +# Trim RELEASE-NOTES to only include recent history: +if [ -r RELEASE-NOTES ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat RELEASE-NOTES | head -n 1000 > $DOCSDIR/RELEASE-NOTES + touch -r RELEASE-NOTES $DOCSDIR/RELEASE-NOTES +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff b/source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff new file mode 100644 index 00000000..b866f0cc --- /dev/null +++ b/source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff @@ -0,0 +1,12 @@ +--- ./misc/mke2fs.conf.in.orig 2016-05-17 00:32:58.000000000 -0500 ++++ ./misc/mke2fs.conf.in 2016-05-24 19:04:24.956000477 -0500 +@@ -11,7 +11,8 @@ + features = has_journal + } + ext4 = { +- features = has_journal,extent,huge_file,flex_bg,64bit,dir_nlink,extra_isize ++ features = has_journal,extent,huge_file,flex_bg,dir_nlink,extra_isize ++ auto_64-bit_support = 1 + inode_size = 256 + } + ext4dev = { diff --git a/source/a/e2fsprogs/slack-desc b/source/a/e2fsprogs/slack-desc index e35c02a2..5a41b153 100644 --- a/source/a/e2fsprogs/slack-desc +++ b/source/a/e2fsprogs/slack-desc @@ -13,7 +13,7 @@ e2fsprogs: e2fsprogs: These utilities were written by Remy Card (the developer and e2fsprogs: maintainer of the ext2 fs) and Theodore T'so. e2fsprogs: -e2fsprogs: +e2fsprogs: http://kernel.org/pub/linux/kernel/people/tytso/e2fsprogs e2fsprogs: e2fsprogs: e2fsprogs: |