diff options
Diffstat (limited to 'source/a/udisks')
-rwxr-xr-x | source/a/udisks/udisks.SlackBuild | 20 | ||||
-rw-r--r-- | source/a/udisks/udisks.no.pci-db.diff | 32 |
2 files changed, 44 insertions, 8 deletions
diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild index 86a90bdf4..dc9b4c780 100755 --- a/source/a/udisks/udisks.SlackBuild +++ b/source/a/udisks/udisks.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for udisks -# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# Copyright 2010, 2011, 2014, 2015 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ PKGNAM=udisks VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} @@ -35,7 +35,7 @@ NUMJOBS=${NUMJOBS:--j7} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -43,8 +43,8 @@ if [ -z "$ARCH" ]; then esac fi -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" @@ -82,6 +82,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/udisks.no.pci-db.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -99,10 +101,12 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Move the bash completion file to the right place -mkdir -p $PKG/etc/bash_completion.d +# Move the bash completion file to the system directory +# Put bash-completion file in system directory: +mkdir -p $PKG/usr/share/bash-completion/completions/ mv $PKG/etc/profile.d/udisks-bash-completion.sh \ - $PKG/etc/bash_completion.d/udisks + $PKG/usr/share/bash-completion/completions/udisks +rmdir --parents $PKG/etc/profile.d find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/source/a/udisks/udisks.no.pci-db.diff b/source/a/udisks/udisks.no.pci-db.diff new file mode 100644 index 000000000..ebb773c68 --- /dev/null +++ b/source/a/udisks/udisks.no.pci-db.diff @@ -0,0 +1,32 @@ +From c73b5ab54378ec6d7df9948c46ce87f98587af9a Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Wed, 21 Nov 2012 02:36:47 +0100 +Subject: [PATCH] udev: remove redundant call to deprecated pci-db + +The binary is no longer shipped with systemd/udev. The functionality +is taken over by a builtin, which is ran for all devices, rendering +this rule superfluous. + +Cc: Jan de Groot <jgc@archlinux.org> +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + data/80-udisks.rules | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/data/80-udisks.rules b/data/80-udisks.rules +index d1c8c5d..4bf2b37 100644 +--- a/data/80-udisks.rules ++++ b/data/80-udisks.rules +@@ -1,10 +1,6 @@ + # Do not edit this file, it will be overwritten on updates + # + +-# import names for PCI storage controllers +-# +-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p" +- + # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure + # the device is on a cardbus controller (upper PCI device) - then we check + # vid/pid (lower PCI device) +-- +1.8.0.1 |