diff options
Diffstat (limited to 'source/a/usbutils')
-rw-r--r-- | source/a/usbutils/usbutils-007.tar.sign | 17 | ||||
-rw-r--r-- | source/a/usbutils/usbutils-008.tar.sign | 17 | ||||
-rwxr-xr-x | source/a/usbutils/usbutils.SlackBuild | 39 |
3 files changed, 25 insertions, 48 deletions
diff --git a/source/a/usbutils/usbutils-007.tar.sign b/source/a/usbutils/usbutils-007.tar.sign deleted file mode 100644 index 4c8ea414..00000000 --- a/source/a/usbutils/usbutils-007.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQIcBAABAgAGBQJRsR1jAAoJEDjbvchgkmk+jFsQAIHKnkijXjdzij6VEBqfq0RO -WrqhtR6EWOwo60/oYIzw0dLynZwBeA4OQ+QGAAA5XSfeSOEPcVRE06bN0Cv9omVj -GYJz5mBguAo6IfRf+rRXd8p9nnC0mS3qTpIA0/T2vSPopImrx2RfbzzpsAeEwTpg -K7qqcdwoApd3qvBCrmPWzSIvTEGnxZPpiy5cBVoZ9YhAx09PinbUGhz7Z3cc/VJZ -nFa+YfCie2P5eJtsv9EXudJs6NhUP02bUHtoDvktDPvQnXOtEqUBF3LsECX16kL3 -nwfWvpyDDRNEhu9jj2QspXHzROO435WTWQB81q0x1Qf14tsGa3SFgGj1mQhweAul -m9t4fo0T+/Kgl1P2kohwa/7ws6WDc1Sy7/sd7cOxDYNQZEH1lH4mja0Qm1ViZ0lR -ydpjHFtcjT/FHSYUOOIdIAg5NXrWhH1moAKduW9byAgM2q68nTGzs93j3uiundZv -knfhfO3WGUlXgLYznyUUTR5xAMLq0zQUV0sNiPLci/jU0dyPMmVhnPsfivK1xN4q -RnpU7cc3/IYYiTdlMz4jOJSMvNF2CU2ebLHEAuelbz9/jte2E+kwc3VAu5bWlSGb -REdcYVgyV+2nA/DU61+wCJC7QIFxC/zHYtQ6vdGIcTndST0fywmtyObuL7kTkmf7 -gDNrUyjKGdFMawPfSAcm -=Ku5j ------END PGP SIGNATURE----- diff --git a/source/a/usbutils/usbutils-008.tar.sign b/source/a/usbutils/usbutils-008.tar.sign new file mode 100644 index 00000000..52f8495a --- /dev/null +++ b/source/a/usbutils/usbutils-008.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABAgAGBQJURsk6AAoJEDjbvchgkmk+F+EQAKVI4MKXye0qmoTgZR70q+o/ +ANwlSg+mwTrpIxHO+dVUY3NPJlj0ZT/TnV3Xbe2UjxDe0JW7CkMeLAocqhdWy4sq +cGUlLASeiANSgv+tilqwHZTpTlM4Wo0EtnDJ29U0oVim8vPED7AXZbENZ3S6nuCk +RrcxVzo9UsBckniIkuY8fsTpcU0FcLsPIhgasw0iToBdVfeZp3LuLF9s69Gt6BK/ +BJKa1L3q14jGcH8MJBO+gQuiu/gYxgdYGXdzqxGmfDSHON/pyOAlzYDdxLAqR76B ++LbQW6lTnlPutlW4QEYfnmKYXvXkof7saKt/UXrJcXNK/YwbiTHiRQ4lxtlP5WyW +vTunBLssJCDVRyQMV2iD9c0PLTiPcGcFp2tpkM1ULUMpnrWLF4K83KQQ2y51NA0p +J/4jQLQWOXjX+e/Ns6R9Mp3D3vh7Jy/fsdyDlsCR2YVMVePBSbQ8n0UqNzQnqa+Z +na2w/51XIazG5ijk4dPhx0hkO+fZVgfMSX+rITlsIjga+ezwwwUDgSc/NZhoteN/ +5pHGXXnsPRmhc+7sG6T3D17w1euu9rZ6eznXGQqrN6pDaxbiH8AnbyYteXQcANr0 +8duSxDb3R74ZVAlhfRF9MeSIdq+bBZCOptiXtAgnEYbYoG8vU3UBuhMc+q7y3Adw +Abrr12hSiLQDnX+T+YlF +=rTq4 +-----END PGP SIGNATURE----- diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild index 0a938025..26336742 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 |