summaryrefslogtreecommitdiff
path: root/source/ap/pm-utils/patches
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/pm-utils/patches')
-rw-r--r--source/ap/pm-utils/patches/add-in-kernel-suspend-to-both.patch32
-rw-r--r--source/ap/pm-utils/patches/fix-wrong-path-in-intel-audio-powersave.patch32
-rw-r--r--source/ap/pm-utils/patches/hook-exit-code-log.patch19
-rw-r--r--source/ap/pm-utils/patches/init-logfile-append.patch13
-rw-r--r--source/ap/pm-utils/patches/log-line-spacing-fix.patch14
-rw-r--r--source/ap/pm-utils/patches/use_more_sane_harddrive_defaults.patch12
6 files changed, 0 insertions, 122 deletions
diff --git a/source/ap/pm-utils/patches/add-in-kernel-suspend-to-both.patch b/source/ap/pm-utils/patches/add-in-kernel-suspend-to-both.patch
deleted file mode 100644
index e09d0766..00000000
--- a/source/ap/pm-utils/patches/add-in-kernel-suspend-to-both.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/pm/pm-functions.in b/pm/pm-functions.in
---- a/pm/pm-functions.in
-+++ b/pm/pm-functions.in
-@@ -316,8 +316,28 @@ if [ -z "$HIBERNATE_MODULE" ] && \
- {
- [ -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
-
diff --git a/source/ap/pm-utils/patches/fix-wrong-path-in-intel-audio-powersave.patch b/source/ap/pm-utils/patches/fix-wrong-path-in-intel-audio-powersave.patch
deleted file mode 100644
index 90039710..00000000
--- a/source/ap/pm-utils/patches/fix-wrong-path-in-intel-audio-powersave.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 67abbd2f5109a732ab967c94bef4d6d9b2a11541 Mon Sep 17 00:00:00 2001
-From: Florian Kriener <florian@kriener.org>
-Date: Sat, 25 Sep 2010 11:27:30 +0200
-Subject: [PATCH] wrong path in intel-audio-powersave (and a small bug)
-
-Package: pm-utils
-Version: 1.4.1-2
-Severity: normal
-Tags: patch
----
- pm/power.d/intel-audio-powersave | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-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
- }
---
-1.7.3.4
-
diff --git a/source/ap/pm-utils/patches/hook-exit-code-log.patch b/source/ap/pm-utils/patches/hook-exit-code-log.patch
deleted file mode 100644
index 7eccd83b..00000000
--- a/source/ap/pm-utils/patches/hook-exit-code-log.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up pm-utils-1.4.1/pm/pm-functions.in.orig pm-utils-1.4.1/pm/pm-functions.in
---- pm-utils-1.4.1/pm/pm-functions.in.orig 2011-08-22 14:52:58.976213050 +0200
-+++ pm-utils-1.4.1/pm/pm-functions.in 2011-08-22 14:57:26.000000000 +0200
-@@ -195,11 +195,13 @@ hook_ok()
- _run_hook() {
- # $1 = hook to run
- # rest of args passed to hook unchanged.
-+ local hook_status
- log "Running hook $*:"
- hook_ok "$1" && "$@"
-+ hook_status=$?
- log ""
-- log -n "$*: "
-- hook_exit_status $? && LAST_HOOK="${1##*/}" || inhibit
-+ log -n "$*: "
-+ hook_exit_status $hook_status && LAST_HOOK="${1##*/}" || inhibit
- }
-
- if profiling; then
diff --git a/source/ap/pm-utils/patches/init-logfile-append.patch b/source/ap/pm-utils/patches/init-logfile-append.patch
deleted file mode 100644
index 07978263..00000000
--- a/source/ap/pm-utils/patches/init-logfile-append.patch
+++ /dev/null
@@ -1,13 +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,9 @@
- return 1
- fi
- export LOGGING=true
-- exec > "$1" 2>&1
-+ rm -f "$1"
-+ touch "$1"
-+ exec >> "$1" 2>&1
- }
-
- check_suspend() { [ -n "$SUSPEND_MODULE" ]; }
diff --git a/source/ap/pm-utils/patches/log-line-spacing-fix.patch b/source/ap/pm-utils/patches/log-line-spacing-fix.patch
deleted file mode 100644
index cf4fbe38..00000000
--- a/source/ap/pm-utils/patches/log-line-spacing-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up pm-utils-1.4.1/pm/pm-functions.in.orig pm-utils-1.4.1/pm/pm-functions.in
---- pm-utils-1.4.1/pm/pm-functions.in.orig 2011-11-02 11:43:24.000000000 +0100
-+++ pm-utils-1.4.1/pm/pm-functions.in 2011-11-02 11:43:49.987116603 +0100
-@@ -199,9 +199,9 @@ _run_hook() {
- log "Running hook $*:"
- hook_ok "$1" && "$@"
- hook_status=$?
-- log ""
- log -n "$*: "
- hook_exit_status $hook_status && LAST_HOOK="${1##*/}" || inhibit
-+ log ""
- }
-
- if profiling; then
diff --git a/source/ap/pm-utils/patches/use_more_sane_harddrive_defaults.patch b/source/ap/pm-utils/patches/use_more_sane_harddrive_defaults.patch
deleted file mode 100644
index 3dcc8156..00000000
--- a/source/ap/pm-utils/patches/use_more_sane_harddrive_defaults.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur pm-utils-1.4.1.orig//pm/power.d/harddrive pm-utils-1.4.1/pm/power.d/harddrive
---- pm-utils-1.4.1.orig//pm/power.d/harddrive 2010-07-04 09:50:13.000000000 -0500
-+++ pm-utils-1.4.1/pm/power.d/harddrive 2010-12-27 14:23:12.729597017 -0600
-@@ -11,7 +11,7 @@
- # Default values on battery
- DRIVE_SPINDOWN_VALUE_BAT="${DRIVE_SPINDOWN_VALUE_BAT:-6}"
- DRIVE_WRITE_CACHE_BAT="${DRIVE_WRITE_CACHE_BAT:-0}"
--DRIVE_POWER_MGMT_BAT="${DRIVE_POWER_MGMT_BAT:-1}"
-+DRIVE_POWER_MGMT_BAT="${DRIVE_POWER_MGMT_BAT:-128}"
- DRIVE_ACOUSTIC_MGMT_BAT="${DRIVE_ACOUSTIC_MGMT_BAT:-254}"
-
- # Default devices to operate on