diff options
Diffstat (limited to 'source/a/e2fsprogs')
-rw-r--r-- | source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign | bin | 543 -> 0 bytes | |||
-rw-r--r-- | source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign | bin | 0 -> 543 bytes | |||
-rwxr-xr-x | source/a/e2fsprogs/e2fsprogs.SlackBuild | 11 |
3 files changed, 10 insertions, 1 deletions
diff --git a/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign Binary files differdeleted file mode 100644 index 6558e77e2..000000000 --- a/source/a/e2fsprogs/e2fsprogs-1.42.6.tar.sign +++ /dev/null diff --git a/source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign Binary files differnew file mode 100644 index 000000000..660df3339 --- /dev/null +++ b/source/a/e2fsprogs/e2fsprogs-1.42.8.tar.sign diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index 3ba78e554..51c268a1d 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -24,7 +24,7 @@ VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -121,6 +121,15 @@ mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/lib${LIBDIRSUFFIX}/*.so \ ln -sf /lib${LIBDIRSUFFIX}/$(readlink $i) $i ; done ) + +# Since fsck is now part of util-linux, let's prefer that version: +if [ -r $PKG/sbin/fsck ]; then + mv $PKG/sbin/fsck $PKG/sbin/fsck-e2fsprogs +fi +if [ -r $PKG/usr/man/man8/fsck.8 ]; then + mv $PKG/usr/man/man8/fsck.8 $PKG/usr/man/man8/fsck-e2fsprogs.8 +fi + # findfs is intentionally left out here - we use the one in util-linux-ng ( cd $PKG/sbin rm -f \ |