summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/usbmon/usbmon.SlackBuild9
-rw-r--r--system/usbmon/usbmon.info2
2 files changed, 8 insertions, 3 deletions
diff --git a/system/usbmon/usbmon.SlackBuild b/system/usbmon/usbmon.SlackBuild
index d2f8411e12..8eec7295bf 100644
--- a/system/usbmon/usbmon.SlackBuild
+++ b/system/usbmon/usbmon.SlackBuild
@@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -35,7 +38,7 @@ chown -R root:root .
chmod -R a-s,u+w,go+r-w .
make CFLAGS="$SLKCFLAGS"
-strip $PRGNAM
+strip --strip-unneeded $PRGNAM
mkdir -p $PKG/usr/sbin
install -m0755 -o root -g root $PRGNAM $PKG/usr/sbin
@@ -43,11 +46,11 @@ mkdir -p $PKG/usr/man/man8
gzip -9c $PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/usbmon/usbmon.info b/system/usbmon/usbmon.info
index 532e1d25d5..27fd753d66 100644
--- a/system/usbmon/usbmon.info
+++ b/system/usbmon/usbmon.info
@@ -3,6 +3,8 @@ VERSION="5.4"
HOMEPAGE="http://people.redhat.com/zaitcev/linux/"
DOWNLOAD="http://people.redhat.com/zaitcev/linux/usbmon-5.4.tar.gz"
MD5SUM="b4a9579d95f34b99b7c7c5e06cd62db5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
APPROVED="dsomero"