summaryrefslogtreecommitdiffstats
path: root/source/a/usbutils/usbutils.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/usbutils/usbutils.SlackBuild')
-rwxr-xr-xsource/a/usbutils/usbutils.SlackBuild39
1 files changed, 8 insertions, 31 deletions
diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild
index 0a9380258..263367427 100755
--- a/source/a/usbutils/usbutils.SlackBuild
+++ b/source/a/usbutils/usbutils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ NUMJOBS=${NUMJOBS:--j7}
# 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 ) ;;
@@ -40,8 +40,8 @@ CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-usbutils
-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"
@@ -68,9 +68,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Fetch the latest usb.ids:
-rm -f usb.ids*
-wget $(grep 'SRC=' update-usbids.sh.in | cut -d= -f2- | tr -d \")
+## Fetch the latest usb.ids:
+#rm -f usb.ids*
+#wget $(grep 'SRC=' update-usbids.sh.in | cut -d= -f2- | tr -d \")
# Use --datadir=/usr/share/hwdata so usb.ids is expected to be there
CFLAGS="$SLKCFLAGS" \
@@ -85,29 +85,6 @@ CFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-# Get rid of this redundant file:
-rm -f $PKG/usr/share/hwdata/usb.ids.gz
-
-## Use the usb.ids file shipped with the hwdata package
-#rm -f $PKG/usr/share/hwdata/usb.ids*
-
-# Put a compat symlink in place for stuff that doesn't know about pkgconfig
-ln -s hwdata/usb.ids $PKG/usr/share/usb.ids
-
-# The usbids are kept under /usr, so it makes no sense at all to have
-# this util in /sbin rather than /usr/sbin:
-mkdir -p $PKG/usr/sbin
-mv $PKG/sbin/update-usbids.sh $PKG/usr/sbin/update-usbids.sh
-
-# Now that they install the util as "update-usbids.sh" instead of
-# "update-usbids", we have to make a compatibility symlink in case
-# anyone is updating this with a cron job or some such:
-( cd $PKG/usr/sbin ; ln -sf update-usbids.sh update-usbids )
-
-# And, since they put the util in /sbin, we'd better at least make the
-# upstream name available there too...
-( cd $PKG/sbin ; ln -sf /usr/sbin/update-usbids.sh . )
-
find $PKG | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -128,7 +105,7 @@ fi
mkdir -p $PKG/usr/doc/usbutils-$VERSION
cp -a \
- AUTHORS COPYING NEWS README \
+ AUTHORS COPYING* NEWS README* \
$PKG/usr/doc/usbutils-$VERSION
# If there's a ChangeLog, installing at least part of the recent history