diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-03-21 03:24:30 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-26 01:20:08 +0700 |
| commit | d69a288478f5896b1bd0b6703c8e3a528ae293ec (patch) | |
| tree | 8e075c7e144d059cdef5dfd7872f56aabedc1dda | |
| parent | 8170c0bbb45d4c98c373474cc8e6118579065e3f (diff) | |
| download | slackbuilds-d69a288478f5896b1bd0b6703c8e3a528ae293ec.tar.gz | |
system/multipath-tools: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/multipath-tools/multipath-tools.SlackBuild | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/system/multipath-tools/multipath-tools.SlackBuild b/system/multipath-tools/multipath-tools.SlackBuild index 3324430d59..b9b2b7f452 100644 --- a/system/multipath-tools/multipath-tools.SlackBuild +++ b/system/multipath-tools/multipath-tools.SlackBuild @@ -23,25 +23,26 @@ # 22-Oct-2018 # Updated for version 0.7.8 +# 20220321 bkw: Modified by SlackBuilds.org, BUILD=2: +# - fix 32-bit build. +# - fix path to kpart_id script in udev rules. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=multipath-tools VERSION=${VERSION:-0.8.7} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; *) export ARCH=$( uname -m ) ;; esac fi -# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -51,8 +52,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -80,9 +81,9 @@ cat $CWD/0002-multipathd-add-ncurses-to-linker.patch | patch -p0 --verbose chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ # Build cd $TMP/$PRGNAM-$VERSION @@ -90,7 +91,10 @@ CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make make install DESTDIR=$PKG # Move everything in place -mv $PKG/usr/lib/ $PKG/ +mkdir -p $PKG/lib +mv $PKG/usr/lib/udev $PKG/lib/udev +rmdir $PKG/usr/lib &>/dev/null || true +sed -i 's,/usr/lib/udev,/lib/udev,' $PKG/lib/udev/rules.d/11-dm-mpath.rules # Manpages mv $PKG/usr/share/man $PKG/usr/ |