ssuominen 14/06/04 20:46:47
Modified: 1.4.1-disable-sata-alpm.patch
1.4.1-logging-append.patch
Added: 1.4.1-uswsusp-hibernate-mode.patch
1.4.1-suspend-hybrid.patch
1.4.1-xfs_buffer_arguments.patch
1.4.1-fix-alpm-typo.patch
1.4.1-ignore-led-failure.patch
1.4.1-run-hook-logging.patch
Log:
Selectively synchronize only bug fixes with Debian patchset version 1.4.1-14.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.2 sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch?r1=1.1&r2=1.2
Index: 1.4.1-disable-sata-alpm.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.4.1-disable-sata-alpm.patch 21 Apr 2011 15:03:19 -0000 1.1
+++ 1.4.1-disable-sata-alpm.patch 4 Jun 2014 20:46:46 -0000 1.2
@@ -2,10 +2,8 @@
Author: Martin Pitt <[email protected]>
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
+--- pm/power.d/sata_alpm
++++ pm/power.d/sata_alpm
@@ -2,7 +2,7 @@
. "${PM_FUNCTIONS}"
1.2 sys-power/pm-utils/files/1.4.1-logging-append.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-logging-append.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-logging-append.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-logging-append.patch?r1=1.1&r2=1.2
Index: 1.4.1-logging-append.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-power/pm-utils/files/1.4.1-logging-append.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.4.1-logging-append.patch 21 Apr 2011 15:03:19 -0000 1.1
+++ 1.4.1-logging-append.patch 4 Jun 2014 20:46:46 -0000 1.2
@@ -4,10 +4,8 @@
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
+--- pm/pm-functions.in
++++ pm/pm-functions.in
@@ -271,7 +271,7 @@
return 1
fi
1.1 sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch?rev=1.1&content-type=text/plain
Index: 1.4.1-uswsusp-hibernate-mode.patch
===================================================================
Description: Check HIBERNATE_MODE in uswsusp module
Author: Vadim Solomin <[email protected]>
Bug-Debian: http://bugs.debian.org/589553
--- pm/module.d/uswsusp
+++ pm/module.d/uswsusp
@@ -87,7 +87,11 @@
HIBERNATE_MODULE="uswsusp"
do_hibernate()
{
- s2disk
+ if [ -n "$HIBERNATE_MODE" ]; then
+ s2disk -P "shutdown method=$HIBERNATE_MODE"
+ else
+ s2disk
+ fi
}
fi
1.1 sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch?rev=1.1&content-type=text/plain
Index: 1.4.1-suspend-hybrid.patch
===================================================================
Description: Add support for in-kernel suspend to both
Author: Bojan Smojver <[email protected]>
Author: Jaroslav Škarvada <[email protected]>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52572
Bug-Ubuntu: https://launchpad.net/bugs/1172692
--- pm/pm-functions.in
+++ pm/pm-functions.in
@@ -336,8 +336,28 @@
{
[ -n "${HIBERNATE_MODE}" ] && \
grep -qw "${HIBERNATE_MODE}" /sys/power/disk && \
+ HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
+ HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
+ HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
echo -n "${HIBERNATE_MODE}" > /sys/power/disk
echo -n "disk" > /sys/power/state
+ RET=$?
+ echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
+ return "$RET"
+ }
+fi
+
+# for kernels that support suspend to both (i.e. hybrid suspend)
+# since kernel 3.6
+if [ -z "$SUSPEND_HYBRID_MODULE" ] && \
+ [ -f /sys/power/disk ] && \
+ grep -q disk /sys/power/state && \
+ grep -q suspend /sys/power/disk; then
+ SUSPEND_HYBRID_MODULE="kernel"
+ do_suspend_hybrid()
+ {
+ HIBERNATE_MODE="suspend"
+ do_hibernate
}
fi
1.1 sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch?rev=1.1&content-type=text/plain
Index: 1.4.1-xfs_buffer_arguments.patch
===================================================================
>From fdc626dadfd985e823f4e828f2a542c945aea219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]>
Date: Tue, 10 Jan 2012 11:21:02 +0100
Subject: [PATCH 2/2] pm/power.d/xfs_buffer: Fix wrong argument ordering
Write the values in the correct order.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44620
Bug-Ubuntu: https://launchpad.net/bugs/645974
Signed-off-by: Martin Pitt <[email protected]>
---
pm/power.d/xfs_buffer | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pm/power.d/xfs_buffer b/pm/power.d/xfs_buffer
index d21e845..9f06f6e 100644
--- a/pm/power.d/xfs_buffer
+++ b/pm/power.d/xfs_buffer
@@ -59,7 +59,7 @@ xfs_ac() {
xfs_battery() {
state_exists xfs_buffer_default || \
read_values |savestate xfs_buffer_default
- write_values "$XFS_AGE_BUFFER" "$XFS_BUFD" "$XFS_SYNCD"
+ write_values "$XFS_AGE_BUFFER" "$XFS_SYNCD" "$XFS_BUFD"
}
case $1 in
--
1.7.7.3
1.1 sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch?rev=1.1&content-type=text/plain
Index: 1.4.1-fix-alpm-typo.patch
===================================================================
>From 93d46b88f415c1931b017856e3162c192bfba07c Mon Sep 17 00:00:00 2001
From: Martin Pitt <[email protected]>
Date: Wed, 11 Jan 2012 15:39:53 +0100
Subject: [PATCH 3/3] Fix typo in sata_alpm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
ALPM → APLM
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44676
Bug-Ubuntu: https://launchpad.net/bugs/900930
---
pm/power.d/sata_alpm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pm/power.d/sata_alpm b/pm/power.d/sata_alpm
index 5ede307..400e1e7 100644
--- a/pm/power.d/sata_alpm
+++ b/pm/power.d/sata_alpm
@@ -28,7 +28,7 @@ set_sata_alpm() {
[ "${kv%-*}" \< "2.6.33" ] && exit $NA # avoid fs corruption
for f in /sys/class/scsi_host/host*; do
[ -w "$f/link_power_management_policy" ] || continue
- printf "Setting SATA APLM on %s to %s..." "${f##*/}" "$1"
+ printf "Setting SATA ALPM on %s to %s..." "${f##*/}" "$1"
echo "$1" > "$f/link_power_management_policy" && echo Done. || \
echo Failed.
done
1.1 sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch?rev=1.1&content-type=text/plain
Index: 1.4.1-ignore-led-failure.patch
===================================================================
Description: LED operation should not block S3/S4
Author: Adam Lee <[email protected]>
Some Lenovo Thinkpad models don't have a suspend LED, this should not
block S3/S4.
--- pm/sleep.d/95led
+++ pm/sleep.d/95led
@@ -14,3 +14,5 @@
*) exit $NA
;;
esac
+
+exit 0
1.1 sys-power/pm-utils/files/1.4.1-run-hook-logging.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch?rev=1.1&content-type=text/plain
Index: 1.4.1-run-hook-logging.patch
===================================================================
Description: In suspend log, put empty line after running the hook, not in
between.
Author: Dominique Brazziel <[email protected]>
Bug-Debian: http://bugs.debian.org/661168
--- pm/pm-functions.in
+++ pm/pm-functions.in
@@ -199,9 +199,9 @@
hook_ok "$1" && "$@"
# log() changes the return value, so save it for later
local status=$?
- log ""
log -n "$*: "
hook_exit_status $status && LAST_HOOK="${1##*/}" || inhibit
+ log ""
}
if profiling; then
