[Pkg-utopia-commits] r1298 - in packages/experimental/hal/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-21 18:38:22 +0000 (Wed, 21 Mar 2007)
New Revision: 1298

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/patches/02_powerscripts.patch
Log:
Revise powerscripts patch for 0.5.9~rc1.
Prefer acpi-support over direct calls to s2disk/s2ram.


Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2007-03-21 18:15:19 UTC (rev 1297)
+++ packages/experimental/hal/debian/changelog	2007-03-21 18:38:22 UTC (rev 1298)
@@ -17,6 +17,8 @@
     - debian/patches/25_correctly_free_lists.patch
     - debian/patches/26_fix_hald_not_running_coredump.patch
     - debian/patches/27_hal_fix_dbus_error_is_set.patch
+  * Revised patches:
+    - debian/patches/02_powerscripts.patch
   * debian/patches/19_sonypi_support.patch
     - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi
       is used directly.

Modified: packages/experimental/hal/debian/patches/02_powerscripts.patch
===================================================================
--- packages/experimental/hal/debian/patches/02_powerscripts.patch	2007-03-21 18:15:19 UTC (rev 1297)
+++ packages/experimental/hal/debian/patches/02_powerscripts.patch	2007-03-21 18:38:22 UTC (rev 1298)
@@ -1,13 +1,14 @@
-diff -u hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux build-tree/hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux
---- hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2006-09-19 22:23:25.000000000 +0200
-+++ build-tree/hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2007-03-06 02:02:12.000000000 +0100
-@@ -39,19 +39,27 @@
+diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
+index 250e191..1adf908 100755
+--- a/tools/linux/hal-system-power-hibernate-linux
++++ b/tools/linux/hal-system-power-hibernate-linux
+@@ -54,27 +54,35 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] \
  
  #Other distros just need to have *any* tools installed
  else
 -	if [ -x "/usr/bin/powersave" ] ; then
 +	if [ -x "/usr/sbin/pm-hibernate" ] ; then
-+		/usr/sbin/pm-hibernate
++		/usr/sbin/pm-hibernate $QUIRKS
 +		RET=$?
 +	elif [ -x "/usr/bin/powersave" ] ; then
  	        $POWERSAVED_SUSPEND2DISK
@@ -16,51 +17,83 @@
  		/usr/sbin/pmi action hibernate force
  		RET=$?
 -	elif [ -x "/usr/sbin/pm-hibernate" ] ; then
--		/usr/sbin/pm-hibernate
+-		/usr/sbin/pm-hibernate $QUIRKS
 -		RET=$?
  	elif [ -x "/usr/sbin/hibernate" ] ; then
  		# Suspend2 tools installed
  		/usr/sbin/hibernate --force
  		RET=$?
++	elif [ -x "/etc/acpi/hibernate.sh" ] ; then
++		# acpi-support installed
++		/etc/acpi/hibernate.sh force
++		RET=$?
 +	elif [ -x "/usr/sbin/s2disk" ] ; then
 +		# uswsusp tools installed
 +		/usr/sbin/s2disk
 +		RET=$?
-+	elif [ -x "/etc/acpi/hibernate.sh" ] ; then
-+		# acpi-support installed
-+		/etc/acpi/hibernate.sh force
-+		RET=$?
  	elif [ -w "/sys/power/state" ] ; then
  		# Use the raw kernel sysfs interface
  		echo "disk" > /sys/power/state
-diff -u hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux build-tree/hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux
---- hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2006-09-19 22:23:25.000000000 +0200
-+++ build-tree/hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2007-03-06 02:02:01.000000000 +0100
-@@ -80,12 +80,26 @@
+ 		RET=$?
+ 	else
+ 		unsupported
+-		fi
+ 	fi
++fi
  
+ #Refresh devices as a resume can do funny things
+ for type in button battery ac_adapter
+diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
+index 8139842..2b2bdfb 100755
+--- a/tools/linux/hal-system-power-suspend-linux
++++ b/tools/linux/hal-system-power-suspend-linux
+@@ -86,24 +86,36 @@ elif [ -f "/etc/redhat-release" ] || [ -f "/etc/fedora-release" ] \
+ 
  #Other distros just need to have *any* tools installed
  else
 -	if [ -x "/usr/bin/powersave" ] ; then
+-	    $POWERSAVED_SUSPEND2RAM
+-	    RET=$?
+-	elif [ -x "/usr/sbin/pmi" ] ; then
+-	    /usr/sbin/pmi action suspend force
+-	    RET=$?
+-	elif [ -x "/usr/sbin/pm-suspend" ] ; then
 +	if [ -x "/usr/sbin/pm-suspend" ] ; then
-+		/usr/sbin/pm-suspend
+ 		/usr/sbin/pm-suspend $QUIRKS
+ 		RET=$?
++	elif [ -x "/usr/bin/powersave" ] ; then
++		$POWERSAVED_SUSPEND2RAM
 +		RET=$?
-+	elif [ -x "/usr/bin/powersave" ] ; then
- 	    $POWERSAVED_SUSPEND2RAM
- 	    RET=$?
- 	elif [ -x "/usr/sbin/pmi" ] ; then
- 	    /usr/sbin/pmi action suspend force
- 	    RET=$?
++	elif [ -x "/usr/sbin/pmi" ] ; then
++		/usr/sbin/pmi action suspend force
++		RET=$?
 +	elif [ -x "/usr/sbin/hibernate" ] ; then
-+	    # Use hibernate configured for suspend-to-ram
-+	    /usr/sbin/hibernate -F/etc/hibernate/ram.conf
-+	    RET=$?
++		# Use hibernate configured for suspend-to-ram
++		/usr/sbin/hibernate -F/etc/hibernate/ram.conf
++		RET=$?
++	elif [ -x "/etc/acpi/sleep.sh" ] ; then
++		# Use acpi-support for suspend to ram 
++		/etc/acpi/sleep.sh force
++		RET=$?
 +	elif [ -x "/usr/sbin/s2ram" ] ; then
-+	    /usr/sbin/s2ram
-+	   RET=$?
-+	elif [ -x "/etc/acpi/sleep.sh" ] ; then
-+	    # Use acpi-support for suspend to ram 
-+	    /etc/acpi/sleep.sh force
-+	    RET=$?
++		# uswsusp tools installed
++		/usr/sbin/s2ram
++		RET=$?
  	elif [ -w "/sys/power/state" ] ; then
- 	    # Use the raw kernel sysfs interface
- 	    echo "mem" > /sys/power/state
+-	    # Use the raw kernel sysfs interface
+-	    echo "mem" > /sys/power/state
+-	    RET=$?
++		# Use the raw kernel sysfs interface
++		echo "mem" > /sys/power/state
++		RET=$?
+ 	else
+-	    # TODO: add other scripts support
+-	    unsupported
+-	    fi
++		# TODO: add other scripts support
++		unsupported
+ 	fi
++fi
+ 
+ #Refresh devices as a resume can do funny things
+ for type in button battery ac_adapter