diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2013-08-30 18:47:39 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2013-08-30 18:47:39 +0000 |
| commit | 2b52038940d04eaa8f988eff562fe645ec6b0220 (patch) | |
| tree | 1e4e23389c5c6b6f2b3fab09f6b6c004d07cef93 /app-laptop | |
| parent | Stable for amd64, wrt bug #450534 (diff) | |
| download | gentoo-2-2b52038940d04eaa8f988eff562fe645ec6b0220.tar.gz gentoo-2-2b52038940d04eaa8f988eff562fe645ec6b0220.tar.bz2 gentoo-2-2b52038940d04eaa8f988eff562fe645ec6b0220.zip | |
Backport udevadm search, bug#477958
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'app-laptop')
3 files changed, 32 insertions, 2 deletions
diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog index 73f4f1500ea9..4634744a585e 100644 --- a/app-laptop/laptop-mode-tools/ChangeLog +++ b/app-laptop/laptop-mode-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-laptop/laptop-mode-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.80 2013/08/30 18:16:23 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.81 2013/08/30 18:47:39 alonbl Exp $ + + 30 Aug 2013; Alon Bar-Lev <alonbl@gentoo.org> + +files/laptop-mode-tools-1.63-udevadm.patch, laptop-mode-tools-1.63-r3.ebuild: + Backport udevadm search, bug#477958 *laptop-mode-tools-1.63-r3 (30 Aug 2013) diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch new file mode 100644 index 000000000000..902d95284398 --- /dev/null +++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch @@ -0,0 +1,25 @@ +From f52ccd0c2de1c2d22d8f351579cf2d89d8110933 Mon Sep 17 00:00:00 2001 +From: Alexander Mezin <mezin.alexander@gmail.com> +Date: Wed, 24 Jul 2013 09:38:56 +0700 +Subject: [PATCH] Replace hardcoded path to udevadm with "which udevadm" + +--- + usr/share/laptop-mode-tools/modules/hdparm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/share/laptop-mode-tools/modules/hdparm b/usr/share/laptop-mode-tools/modules/hdparm +index 0115422..ac4f9c0 100755 +--- a/usr/share/laptop-mode-tools/modules/hdparm ++++ b/usr/share/laptop-mode-tools/modules/hdparm +@@ -41,7 +41,7 @@ is_capable() { + # It assumes more or less recent udev (> 070) + if [ $HAVE_UDEVINFO -ne 0 ] ; then + log "VERBOSE" "Querying $1 media type using udevinfo: " +- if [ -x /sbin/udevadm ]; then ++ if [ -x "$(which udevadm 2> /dev/null)" ]; then + eval "$(udevadm info -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )" + else + eval "$(udevinfo -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )" +-- +1.8.1.6 + diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild index b839d2d46b3f..ab49e68b3950 100644 --- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild +++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild,v 1.1 2013/08/30 18:16:23 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r3.ebuild,v 1.2 2013/08/30 18:47:39 alonbl Exp $ EAPI=5 inherit eutils multilib systemd udev @@ -31,6 +31,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch" epatch "${FILESDIR}/${P}-killall.patch" epatch "${FILESDIR}/${P}-conf.patch" + epatch "${FILESDIR}/${P}-udevadm.patch" # This should avoid conflict with pm-powersave wrt #327443 and #396703 cat <<-EOF > "${T}"/${PN} |