summaryrefslogtreecommitdiff
path: root/source/a/jfsutils
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/jfsutils')
-rwxr-xr-xsource/a/jfsutils/jfsutils.SlackBuild31
-rw-r--r--source/a/jfsutils/slack-desc18
2 files changed, 30 insertions, 19 deletions
diff --git a/source/a/jfsutils/jfsutils.SlackBuild b/source/a/jfsutils/jfsutils.SlackBuild
index 1795e970..1c9496d8 100755
--- a/source/a/jfsutils/jfsutils.SlackBuild
+++ b/source/a/jfsutils/jfsutils.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,27 +20,35 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=jfsutils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-jfsutils
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
elif [ "$ARCH" = "x86_64" ]; then
@@ -52,7 +60,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf jfsutils-$VERSION
tar xvf $CWD/jfsutils-$VERSION.tar.?z* || exit 1
-cd jfsutils-$VERSION
+cd jfsutils-$VERSION || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -60,13 +68,16 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix build with recent glibc:
+sed "s@<unistd.h>@&\n#include <sys/types.h>@g" -i fscklog/extract.c
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--disable-dependency-tracking \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
-make
+make || exit 1
mkdir -p $PKG/sbin
cat fsck/jfs_fsck > $PKG/sbin/jfs_fsck
diff --git a/source/a/jfsutils/slack-desc b/source/a/jfsutils/slack-desc
index d9c52dd2..2ef80cf9 100644
--- a/source/a/jfsutils/slack-desc
+++ b/source/a/jfsutils/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
jfsutils: jfsutils (IBM JFS utilities)
jfsutils:
jfsutils: Utilities for managing IBM's Journaled File System (JFS) under Linux:
-jfsutils: jfs_debugfs - shell-type JFS file system editor.
-jfsutils: jfs_fsck - check and repair a JFS formatted device.
-jfsutils: jfs_fscklog - extract a JFS fsck service log into a file.
-jfsutils: jfs_logdump - dump a JFS formatted device's journal log.
-jfsutils: jfs_mkfs - create a JFS formatted partition.
-jfsutils: jfs_tune - adjust tunable file system parameters on JFS.
+jfsutils: jfs_debugfs - shell-type JFS file system editor.
+jfsutils: jfs_fsck - check and repair a JFS formatted device.
+jfsutils: jfs_fscklog - extract a JFS fsck service log into a file.
+jfsutils: jfs_logdump - dump a JFS formatted device's journal log.
+jfsutils: jfs_mkfs - create a JFS formatted partition.
+jfsutils: jfs_tune - adjust tunable file system parameters on JFS.
jfsutils:
jfsutils: