summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-laptop')
-rw-r--r--app-laptop/laptop-mode-tools/ChangeLog9
-rw-r--r--app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch34
-rw-r--r--app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild94
3 files changed, 136 insertions, 1 deletions
diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog
index 32d27f4e885f..2b180289fd55 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.72 2013/03/23 17:41:47 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.73 2013/03/29 07:59:39 alonbl Exp $
+
+*laptop-mode-tools-1.63-r1 (29 Mar 2013)
+
+ 29 Mar 2013; Alon Bar-Lev <alonbl@gentoo.org>
+ +files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch,
+ +laptop-mode-tools-1.63-r1.ebuild:
+ Fix pcie-aspm issue, per bug#462900, thanks to Manuel Rüger
*laptop-mode-tools-1.63 (23 Mar 2013)
diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
new file mode 100644
index 000000000000..6d741738f1a1
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-pcie-aspm-silencing-stderr.patch
@@ -0,0 +1,34 @@
+From f52e9afc8966d3804e6a432b0a98bfa2a758c416 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <mrueg@rueg.eu>
+Date: Thu, 28 Mar 2013 01:24:39 +0100
+Subject: [PATCH] pcie-aspm: Silencing stderr.
+
+---
+ usr/share/laptop-mode-tools/modules/pcie-aspm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/usr/share/laptop-mode-tools/modules/pcie-aspm b/usr/share/laptop-mode-tools/modules/pcie-aspm
+index 1f6eec9..57fe31e 100755
+--- a/usr/share/laptop-mode-tools/modules/pcie-aspm
++++ b/usr/share/laptop-mode-tools/modules/pcie-aspm
+@@ -7,7 +7,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
+ if [ $ON_AC -eq 1 ]; then
+ log "VERBOSE" "On AC power: setting pcie_aspm to default"
+ if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
+- echo default > /sys/module/pcie_aspm/parameters/policy
++ echo default > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
+ if [ $? -eq 0 ]; then
+ log "VERBOSE" "PCIe ASPM set to 'default'"
+ else
+@@ -19,7 +19,7 @@ if [ x$CONTROL_PCIE_ASPM = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_PCI
+ else
+ log "VERBOSE" "On battery: setting pcie_aspm to powersave"
+ if [ -f /sys/module/pcie_aspm/parameters/policy ]; then
+- echo powersave > /sys/module/pcie_aspm/parameters/policy
++ echo powersave > /sys/module/pcie_aspm/parameters/policy 2>/dev/null
+ if [ $? -eq 0 ]; then
+ log "VERBOSE" "PCIe ASPM set to 'powersave'"
+ else
+--
+1.8.1.5
+
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild
new file mode 100644
index 000000000000..7b020c6d7dc5
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.63-r1.ebuild
@@ -0,0 +1,94 @@
+# 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-r1.ebuild,v 1.1 2013/03/29 07:59:39 alonbl Exp $
+
+EAPI=5
+inherit eutils multilib systemd udev
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="http://www.samwel.tk/laptop_mode/"
+SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi apm bluetooth scsi systemd"
+
+RDEPEND="net-wireless/wireless-tools
+ sys-apps/ethtool
+ sys-apps/hdparm
+ acpi? ( sys-power/acpid )
+ apm? ( sys-apps/apmd )
+ bluetooth? ( net-wireless/bluez:= )
+ scsi? ( sys-apps/sdparm )
+ systemd? ( sys-apps/systemd )"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-pcie-aspm-silencing-stderr.patch"
+
+ # This should avoid conflict with pm-powersave wrt #327443 and #396703
+ cat <<-EOF > "${T}"/${PN}
+ HOOK_BLACKLIST="00powersave"
+ EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+ DESTDIR="${D}" \
+ INIT_D="none" \
+ MAN_D="/usr/share/man" \
+ LIB_D="/usr/$(get_libdir)" \
+ UDEV_D="$(udev_get_udevdir)" \
+ SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
+ TMPFILES_D="/usr/$(get_libdir)/tmpfiles.d" \
+ ACPI="$(use acpi && echo force || echo disabled)" \
+ PMU="$(false && echo force || echo disabled)" \
+ APM="$(use apm && echo force || echo disabled)" \
+ SYSTEMD="$(use systemd && echo yes || echo no)" \
+ sh ./install.sh || die
+
+ dodoc Documentation/*.txt README
+ newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+ # See src_prepare()
+ insinto /etc/pm/config.d
+ doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+ if use acpi || use apm; then
+ if use acpi; then
+ daemon_name="acpid"
+ elif use apm; then
+ deamon_name="apmd"
+ fi
+ if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+ ewarn "To enable automatic power state event handling,"
+ ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+ ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+ ewarn "added to default runlevel:"
+ if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+ ewarn "# rc-update add laptop_mode default"
+ fi
+ if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+ ewarn "# rc-update add ${daemon_name} default"
+ fi
+ fi
+ else
+ ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+ ewarn "automatically disable laptop_mode on low battery."
+ ewarn
+ ewarn "This means you can lose up to 10 minutes of work if running"
+ ewarn "out of battery while laptop_mode is enabled."
+ ewarn
+ ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+ ewarn "information."
+ ewarn
+ fi
+}