diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-05-17 19:00:33 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-05-17 19:00:33 +0000 |
| commit | f75dd353643dd02f4591a82e2d546d7a0250b29a (patch) | |
| tree | 3b6bbecc70614a4a5119eff715025418aa811545 /games-util | |
| parent | Remove old. (diff) | |
| download | gentoo-2-f75dd353643dd02f4591a82e2d546d7a0250b29a.tar.gz gentoo-2-f75dd353643dd02f4591a82e2d546d7a0250b29a.tar.bz2 gentoo-2-f75dd353643dd02f4591a82e2d546d7a0250b29a.zip | |
fix my udev patch with updates from Piotr Chmura
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/joystick/ChangeLog | 6 | ||||
| -rw-r--r-- | games-util/joystick/files/joystick-1.4.8-udev.patch | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog index 10945caecae0..1d019a732538 100644 --- a/games-util/joystick/ChangeLog +++ b/games-util/joystick/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-util/joystick # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.32 2015/05/16 06:04:45 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.33 2015/05/17 19:00:33 mr_bones_ Exp $ + + 17 May 2015; Michael Sterrett <mr_bones_@gentoo.org> + files/joystick-1.4.8-udev.patch: + fix my udev patch with updates from Piotr Chmura *joystick-1.4.8-r1 (16 May 2015) diff --git a/games-util/joystick/files/joystick-1.4.8-udev.patch b/games-util/joystick/files/joystick-1.4.8-udev.patch index c8d78adaded0..c0032493ebf7 100644 --- a/games-util/joystick/files/joystick-1.4.8-udev.patch +++ b/games-util/joystick/files/joystick-1.4.8-udev.patch @@ -9,7 +9,7 @@ diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1 - echo Restoring joystick configuration requires udev! >&2 +for f in /sbin/udevadm /bin/udevadm ; +do -+ [ -x $f ] && UDEV=$f ++ [ -x $f ] && UDEVADM=$f +done + +if [ -z "$UDEVADM" ] ; then @@ -22,7 +22,7 @@ diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1 IFS=$'\x0A' -for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do -+for ATTRIBUTE in $( ${UDEVADM} -a -n $1 | @@PREFIX@@/share/joystick/ident ); do ++for ATTRIBUTE in $( ${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = ) VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" ) case $ID in @@ -35,7 +35,7 @@ diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-store.in linuxconsoletools-1.4 fi +for f in /sbin/udevadm /bin/udevadm ; +do -+ [ -x $f ] && UDEV=$f ++ [ -x $f ] && UDEVADM=$f +done -if [ ! -x /sbin/udevadm ]; then |