[arch-commits] Commit in pm-utils/trunk (6 files)
Jan de Groot
jgc at archlinux.org
Fri Mar 25 07:49:31 UTC 2011
Date: Friday, March 25, 2011 @ 03:49:30
Author: jgc
Revision: 116693
Add patches from debian to fix some hooks
Re-enable most hooks, leave out wol and harddrive, as WoL makes no sense and harddrive breaks harddisks
Added:
pm-utils/trunk/02-logging-append.patch
pm-utils/trunk/12-fix-intel-audio-powersave-hook.patch
pm-utils/trunk/13-49bluetooth-sync.patch
pm-utils/trunk/14-disable-sata-alpm.patch
Modified:
pm-utils/trunk/PKGBUILD
Deleted:
pm-utils/trunk/pm-utils-1.4.1-init-logfile-append.patch
------------------------------------------+
02-logging-append.patch | 19 ++++++++++++
12-fix-intel-audio-powersave-hook.patch | 40 ++++++++++++++++++++++++++
13-49bluetooth-sync.patch | 43 +++++++++++++++++++++++++++++
14-disable-sata-alpm.patch | 26 +++++++++++++++++
PKGBUILD | 21 ++++++++++----
pm-utils-1.4.1-init-logfile-append.patch | 12 --------
6 files changed, 143 insertions(+), 18 deletions(-)
Added: 02-logging-append.patch
===================================================================
--- 02-logging-append.patch (rev 0)
+++ 02-logging-append.patch 2011-03-25 07:49:30 UTC (rev 116693)
@@ -0,0 +1,19 @@
+Author: James Westby <james.westby at ubuntu.com>
+Description: Do not clear the log file on each operation, but instead append to it.
+ This makes debugging of several suspends much easier.
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255
+Bug-Ubuntu: https://launchpad.net/bugs/410352
+
+Index: pm-utils/pm/pm-functions.in
+===================================================================
+--- pm-utils.orig/pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200
++++ pm-utils/pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200
+@@ -271,7 +271,7 @@
+ return 1
+ fi
+ export LOGGING=true
+- exec > "$1" 2>&1
++ exec >> "$1" 2>&1
+ }
+
+ check_suspend() { [ -n "$SUSPEND_MODULE" ]; }
Added: 12-fix-intel-audio-powersave-hook.patch
===================================================================
--- 12-fix-intel-audio-powersave-hook.patch (rev 0)
+++ 12-fix-intel-audio-powersave-hook.patch 2011-03-25 07:49:30 UTC (rev 116693)
@@ -0,0 +1,40 @@
+From: Florian Kriener <florian at kriener.org>
+To: submit at bugs.debian.org
+Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug)
+Date: Sat, 25 Sep 2010 11:27:30 +0200
+
+In the script intel-audio-powersave is this loop
+
+for dev in /sys/module/snd_*/parameters/power_save; do
+ [ -w "$dev/parameters/power_save" ] || continue
+ printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
+ echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
+done
+
+I think it should be
+
+for dev in /sys/module/snd_*; do
+ [ -w "$dev/parameters/power_save" ] || continue
+ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
+ echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
+done
+
+
+This fixes the two bugs.
+
+diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave
+index 36675a8..da63e40 100644
+--- a/pm/power.d/intel-audio-powersave
++++ b/pm/power.d/intel-audio-powersave
+@@ -20,9 +20,9 @@ EOF
+
+ audio_powersave() {
+ [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
+- for dev in /sys/module/snd_*/parameters/power_save; do
++ for dev in /sys/module/snd_*; do
+ [ -w "$dev/parameters/power_save" ] || continue
+- printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
++ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
+ echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
+ done
+ }
Added: 13-49bluetooth-sync.patch
===================================================================
--- 13-49bluetooth-sync.patch (rev 0)
+++ 13-49bluetooth-sync.patch 2011-03-25 07:49:30 UTC (rev 116693)
@@ -0,0 +1,43 @@
+From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Mon, 31 Jan 2011 15:30:01 +0100
+Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused
+
+The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't
+synchronous, i. e. it doesn't wait until the module usage count actually drops
+to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some
+models/older kernels you need to do that to fix suspend problems), as at that
+point the module is still in use.
+
+On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to
+unload, so use 100 ms wait steps with a timeout of 2 seconds.
+
+Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759
+Bug-Ubuntu: https://launchpad.net/bugs/698331
+---
+ pm/sleep.d/49bluetooth | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth
+index d46ba49..0dc1909 100755
+--- a/pm/sleep.d/49bluetooth
++++ b/pm/sleep.d/49bluetooth
+@@ -12,6 +12,15 @@ suspend_bluetooth()
+ if grep -q enabled /proc/acpi/ibm/bluetooth; then
+ savestate ibm_bluetooth enable
+ echo disable > /proc/acpi/ibm/bluetooth
++
++ # wait for up to 2 seconds for the module to actually get
++ # unused
++ TIMEOUT=20
++ while [ $TIMEOUT -ge 0 ]; do
++ [ `cat /sys/module/btusb/refcnt` = 0 ] && break
++ TIMEOUT=$((TIMEOUT-1))
++ sleep 0.1
++ done
+ else
+ savestate ibm_bluetooth disable
+ fi
+--
+1.7.2.3
+
Added: 14-disable-sata-alpm.patch
===================================================================
--- 14-disable-sata-alpm.patch (rev 0)
+++ 14-disable-sata-alpm.patch 2011-03-25 07:49:30 UTC (rev 116693)
@@ -0,0 +1,26 @@
+Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/539467
+
+Index: pm-utils/pm/power.d/sata_alpm
+===================================================================
+--- pm-utils.orig/pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100
++++ pm-utils/pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100
+@@ -2,7 +2,7 @@
+
+ . "${PM_FUNCTIONS}"
+
+-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true}
++SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false}
+
+ help() {
+ cat <<EOF
+@@ -16,7 +16,7 @@
+
+ This hook has 1 parameter:
+ SATA_ALPM_ENABLE = whether to use SATA ALPM on battery.
+-Defaults to "true".
++Defaults to "false".
+
+ EOF
+ }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-24 22:49:34 UTC (rev 116692)
+++ PKGBUILD 2011-03-25 07:49:30 UTC (rev 116693)
@@ -5,7 +5,7 @@
pkgname=pm-utils
pkgver=1.4.1
-pkgrel=2
+pkgrel=3
pkgdesc="Utilities and scripts for suspend and hibernate power management"
arch=('i686' 'x86_64')
url="http://pm-utils.freedesktop.org"
@@ -13,15 +13,24 @@
depends=('bash' 'procps' 'pm-quirks')
makedepends=('xmlto' 'docbook-xml' 'docbook-xsl')
source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
- pm-utils-1.4.1-init-logfile-append.patch
+02-logging-append.patch
+12-fix-intel-audio-powersave-hook.patch
+13-49bluetooth-sync.patch
+14-disable-sata-alpm.patch
11netcfg)
md5sums=('1742a556089c36c3a89eb1b957da5a60'
- '358cbfe1686922e2d81f22fa034ba58a'
+ 'a45149617bf3eb8dc32e6d9e22ae715d'
+ 'edada31a7d722763513fbe705d95d19d'
+ '298f78b873c03c025700d5da619ac134'
+ 'd0040f7d30b6a0dd195b5401abbbbdb9'
'9839687c8787d99fd4ff36aa3238c27b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/pm-utils-1.4.1-init-logfile-append.patch"
+ patch -Np1 -i "${srcdir}/02-logging-append.patch"
+ patch -Np1 -i "${srcdir}/12-fix-intel-audio-powersave-hook.patch"
+ patch -Np1 -i "${srcdir}/13-49bluetooth-sync.patch"
+ patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch"
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var
@@ -34,6 +43,6 @@
# nm >=0.8.2 has native udev suspend/resume support
rm -f "${pkgdir}/usr/lib/pm-utils/sleep.d/55NetworkManager"
- # Do not mess with powersaving options when user switches to battery
- rm -f "${pkgdir}"/usr/lib/pm-utils/power.d/*
+ # Remove hooks that cause hardware failure or don't make sense at all
+ rm -f "${pkgdir}/usr/lib/pm-utils/power.d/"{harddrive,disable_wol}
}
Deleted: pm-utils-1.4.1-init-logfile-append.patch
===================================================================
--- pm-utils-1.4.1-init-logfile-append.patch 2011-03-24 22:49:34 UTC (rev 116692)
+++ pm-utils-1.4.1-init-logfile-append.patch 2011-03-25 07:49:30 UTC (rev 116693)
@@ -1,12 +0,0 @@
---- pm-utils-1.4.1/pm/pm-functions.in.old 2010-07-04 16:50:13.000000000 +0200
-+++ pm-utils-1.4.1/pm/pm-functions.in 2010-12-07 16:48:39.555074652 +0100
-@@ -271,7 +271,8 @@
- return 1
- fi
- export LOGGING=true
-- exec > "$1" 2>&1
-+ rm -f "$1"
-+ exec >> "$1" 2>&1
- }
-
- check_suspend() { [ -n "$SUSPEND_MODULE" ]; }
More information about the arch-commits
mailing list