diff --git a/srcpkgs/pm-utils/INSTALL b/srcpkgs/pm-utils/INSTALL deleted file mode 100644 index 7571c5de16..0000000000 --- a/srcpkgs/pm-utils/INSTALL +++ /dev/null @@ -1,9 +0,0 @@ -case "$ACTION" in -post) - if [ -d usr/sbin -a ! -L usr/sbin ]; then - for f in hibernate powersave suspend suspend-hybrid; do - ln -sfr usr/bin/pm-$f usr/sbin/pm-$f - done - fi - ;; -esac diff --git a/srcpkgs/pm-utils/patches/02-logging-append.patch b/srcpkgs/pm-utils/patches/02-logging-append.patch deleted file mode 100644 index 2753097ab5..0000000000 --- a/srcpkgs/pm-utils/patches/02-logging-append.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: James Westby -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 - ---- pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200 -+++ 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" ]; } diff --git a/srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch b/srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch deleted file mode 100644 index 1c27047982..0000000000 --- a/srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Florian Kriener -To: submit@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. - ---- pm/power.d/intel-audio-powersave -+++ 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 - } diff --git a/srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch b/srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch deleted file mode 100644 index 8afaf37f30..0000000000 --- a/srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -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(-) - ---- pm/sleep.d/49bluetooth -+++ 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 - diff --git a/srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch b/srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch deleted file mode 100644 index 4df76cdc48..0000000000 --- a/srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware. -Author: Martin Pitt -Bug-Ubuntu: https://launchpad.net/bugs/539467 - ---- pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100 -+++ 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 < /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/srcpkgs/pm-utils/template b/srcpkgs/pm-utils/template deleted file mode 100644 index 09d47f2b30..0000000000 --- a/srcpkgs/pm-utils/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'pm-utils' -pkgname=pm-utils -version=1.4.1 -revision=8 -build_style=gnu-configure -configure_args="--sbindir=/usr/bin" -make_dirs=" - /etc/pm/sleep.d 0755 root root - /etc/pm/power.d 0755 root root - /etc/pm/config.d 0755 root root" -hostmakedepends="xmlto" -depends="procps-ng" -short_desc="Power Management Utilities" -maintainer="Christian Neukirchen " -license="GPL-2" -homepage="http://pm-utils.freedesktop.org/" -distfiles="http://pm-utils.freedesktop.org/releases/${pkgname}-${version}.tar.gz" -checksum=8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b - -post_install() { - rm "${DESTDIR}/usr/lib/pm-utils/sleep.d/55NetworkManager" \ - "${DESTDIR}/usr/lib/pm-utils/power.d/"{harddrive,disable_wol} -}