diff options
| -rw-r--r-- | app-laptop/laptop-mode-tools/ChangeLog | 9 | ||||
| -rw-r--r-- | app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch | 41 | ||||
| -rw-r--r-- | app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild (renamed from app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r1.ebuild) | 3 |
3 files changed, 51 insertions, 2 deletions
diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog index d7296eed02e2..7bc970948f9e 100644 --- a/app-laptop/laptop-mode-tools/ChangeLog +++ b/app-laptop/laptop-mode-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-laptop/laptop-mode-tools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.89 2014/06/07 17:13:16 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.90 2014/06/11 22:29:13 alonbl Exp $ + +*laptop-mode-tools-1.64-r2 (11 Jun 2014) + + 11 Jun 2014; Alon Bar-Lev <alonbl@gentoo.org> + +files/laptop-mode-tools-1.64-wireless-sysfsattr.patch, + +laptop-mode-tools-1.64-r2.ebuild, -laptop-mode-tools-1.64-r1.ebuild: + Add wireless kernel compatibility, bug#511110, thanks to Stefan Huber 07 Jun 2014; Alon Bar-Lev <alonbl@gentoo.org> laptop-mode-tools-1.64-r1.ebuild: diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch new file mode 100644 index 000000000000..ba7b86251c16 --- /dev/null +++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch @@ -0,0 +1,41 @@ +commit b340a340256c8fc97ec35a1df9e67ab033765480 +Author: Alon Bar-Lev <alon.barlev@gmail.com> +Date: Sat May 24 12:59:21 2014 +0300 + + wireless: support both sysfs attr enable/enabled + + backport of commit 8e8a88373079dffdf7196e2e622c5ade209b4439 + + Starting with linux kernel 3.13, the sysfs attribute 'enable' for pci + devices was renambed to 'enabled'. + + Support the two notations to allow seamless migration. + + Signed-off-by: Stefan Huber <shuber@sthu.org> + +diff --git a/usr/share/laptop-mode-tools/modules/wireless-ipw-power b/usr/share/laptop-mode-tools/modules/wireless-ipw-power +index 3fd93ec..1579c1f 100755 +--- a/usr/share/laptop-mode-tools/modules/wireless-ipw-power ++++ b/usr/share/laptop-mode-tools/modules/wireless-ipw-power +@@ -71,7 +71,7 @@ if [ x$CONTROL_IPW_POWER = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_IPW + # the driver. + LINK_TARGET=`readlink $DEVICE/device/driver` + LINK_TARGET=${LINK_TARGET##*/} +- ENABLED=`cat $DEVICE/device/enable` ++ ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable` + + if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ]; then + # add the interface name to the list +diff --git a/usr/share/laptop-mode-tools/modules/wireless-iwl-power b/usr/share/laptop-mode-tools/modules/wireless-iwl-power +index ffdedec..ce82e1d 100755 +--- a/usr/share/laptop-mode-tools/modules/wireless-iwl-power ++++ b/usr/share/laptop-mode-tools/modules/wireless-iwl-power +@@ -24,7 +24,7 @@ findWifiIfsByDriver () { + # the driver. + LINK_TARGET=`readlink $DEVICE/device/driver` + LINK_TARGET=${LINK_TARGET##*/} +- ENABLED=`cat $DEVICE/device/enable` ++ ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable` + + if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ] ; then + # add the interface name to the list diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild index 40ab731ba3c3..58673eba981e 100644 --- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r1.ebuild +++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.64-r1.ebuild,v 1.3 2014/06/07 17:13:16 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild,v 1.1 2014/06/11 22:29:13 alonbl Exp $ EAPI=5 inherit eutils multilib systemd udev @@ -31,6 +31,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}/${P}-ethernet-power.patch" + epatch "${FILESDIR}/${P}-wireless-sysfsattr.patch" # This should avoid conflict with pm-powersave wrt #327443 and #396703 cat <<-EOF > "${T}"/${PN} |