Hello community,
here is the log from the commit of package powersave
checked in at Fri Nov 17 19:07:20 CET 2006.
--------
--- powersave/powersave.changes 2006-11-06 17:44:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/powersave/powersave.changes 2006-11-17 17:45:35.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Nov 17 17:42:09 CET 2006 - hmacht@suse.de
+
+- mark suspend configuration options as deprecated
+- update powersave cmd line client manpage
+- set correct cpufreq policy when enabling/disabling CPUs
+- r2684
+
+-------------------------------------------------------------------
Old:
----
powersave-0.15.7.tar.bz2
New:
----
powersave-0.15.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powersave.spec ++++++
--- /var/tmp/diff_new_pack.AvM3VE/_old 2006-11-17 19:07:04.000000000 +0100
+++ /var/tmp/diff_new_pack.AvM3VE/_new 2006-11-17 19:07:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package powersave (Version 0.15.7)
+# spec file for package powersave (Version 0.15.8)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,9 +14,9 @@
BuildRequires: dbus-1-glib-devel gcc-c++ liblazy lynx pkgconfig
URL: http://powersave.sourceforge.net/
Summary: General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling
-Version: 0.15.7
+Version: 0.15.8
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/Daemons
Autoreqprov: on
PreReq: %insserv_prereq %fillup_prereq pwdutils
@@ -167,6 +167,11 @@
%_libdir/lib*.so*
%changelog -n powersave
+* Fri Nov 17 2006 - hmacht@suse.de
+- mark suspend configuration options as deprecated
+- update powersave cmd line client manpage
+- set correct cpufreq policy when enabling/disabling CPUs
+- r2684
* Mon Nov 06 2006 - hmacht@suse.de
- remove docking station handling for thinkpads, it's provided by
dockutils
++++++ powersave-0.15.7.tar.bz2 -> powersave-0.15.8.tar.bz2 ++++++
++++ 30210 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.7/config.h.in new/powersave-0.15.8/config.h.in
--- old/powersave-0.15.7/config.h.in 2006-11-06 17:25:39.000000000 +0100
+++ new/powersave-0.15.8/config.h.in 2006-11-17 17:45:12.000000000 +0100
@@ -221,7 +221,7 @@
/* Define to `int' if does not define. */
#undef pid_t
-/* Define to `unsigned' if does not define. */
+/* Define to `unsigned int' if does not define. */
#undef size_t
/* Define as `fork' if `vfork' does not work. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.7/config_files/sleep new/powersave-0.15.8/config_files/sleep
--- old/powersave-0.15.7/config_files/sleep 2006-11-06 17:24:19.000000000 +0100
+++ new/powersave-0.15.8/config_files/sleep 2006-11-17 17:44:54.000000000 +0100
@@ -1,3 +1,11 @@
+#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
+# The settings made in this file are ignored. The new method of doing
+# suspend is pm-utils. All related code will be removed from powersaved
+# very soon. For more information have a look at
+# http://en.opensuse.org/Pm-utils
+
## Path: System/Powermanagement/Powersave/Sleep_Modes
## Description: Configuration of all three sleep modes (S2 is not supported):
## S1 sleep (only ACPI) low wake-up latency,
@@ -19,6 +27,8 @@
## Default: "usb_storage sbp2 ohci_hcd uhci_hcd stir4200 ohci1394 ipw2200 rt2500 prism54 ath_pci r8169 lt_modem Intel536 Intel537 ndiswrapper"
## ServiceRestart:
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# These modules will be unloaded before entering suspend to disk
# See README.unload-modules for more information.
# "NONE" means don't unload any modules.
@@ -29,6 +39,8 @@
## Default: "usb_storage sbp2 ohci_hcd uhci_hcd stir4200 ohci1394 ipw2200 rt2500 prism54 ath_pci r8169 lt_modem Intel536 Intel537 ndiswrapper"
## ServiceRestart:
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# These modules will be unloaded before entering the corresponding
# sleep state. See README.unload-modules for more information.
# "NONE" means don't unload any modules.
@@ -39,6 +51,8 @@
## Default: "usb_storage sbp2 ohci_hcd uhci_hcd stir4200 ohci1394 ipw2200 rt2500 prism54 ath_pci r8169 lt_modem Intel536 Intel537 ndiswrapper"
## ServiceRestart:
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# These modules will be unloaded before entering the corresponding
# sleep state. See README.unload-modules for more information.
# "NONE" means don't unload any modules.
@@ -48,6 +62,8 @@
## Type: string
## Default: "slmodemd irda upsd apcupsd"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# All services that have to be stopped before entering a sleep mode
# and restarted after the machine resumes.
# If you notice problems of some services that may be related to
@@ -64,6 +80,8 @@
## Type: yesno
## Default: "yes"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# Should FAT and NTFS filesystems be unmounted before entering
# a sleep mode and remounted after the machine resumed?
# You should do this for suspend to disk if you want to boot
@@ -81,6 +99,8 @@
## Type: yesno
## Default: "no"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# Should PCMCIA cards (CardBus and PC-Card) be ejected before entering
# a sleep mode and reinserted after the machine resumed?
# This should not be necessary for most CardBus cards, PC-Cards seem to
@@ -94,6 +114,8 @@
## Default: "no"
## ServiceRestart: powersaved
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# If /usr/sbin/s2ram is installed but does not know about your machine,
# you can force suspend to RAM for unknown machines by setting this
# variable to yes.
@@ -107,6 +129,8 @@
## Default: "0"
## ServiceRestart: powersaved
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# If SUSPEND2RAM_FORCE is set to yes and s2ram is installed, you can set
# the acpi_sleep parameter here. This is a number, 1 means "s3_bios",
# 2 means "s3_mode" 3 means "s3bios,s3mode".
@@ -122,6 +146,8 @@
## Default: "no"
## ServiceRestart: powersaved
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# if SUSPEND2RAM_FORCE is set to yes and s2ram is installed, you can enable
# the equivalent of "vbetool vbestate save/restore" before/after suspend to
# RAM with this variable. This does restore the state of the graphics chip
@@ -134,6 +160,8 @@
## Default: "no"
## ServiceRestart: powersaved
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# if SUSPEND2RAM_FORCE is set to yes and s2ram is installed, you can enable
# the equivalent of "vbetool post" after suspend to RAM. This reinitializes
# the graphics chip on many machines.
@@ -144,6 +172,8 @@
## Type: string(platform,firmware,shutdown,reboot)
## Default: "platform"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# Specify the shutdown method the kernel uses after suspend-to-disk.
# "shutdown" is known to work on most machines, "platform" may work,
# too. "firmware" will most likely not work, "reboot" is for
@@ -155,6 +185,8 @@
## Type: yesno
## Default: "no"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# Should the system clock be reset from the hardware clock after
# suspend-to-disk or suspend-to-RAM? This may be unneccessary depending
# on kernel version and SUSPEND2DISK_SHUTDOWN_MODE, but will not hurt.
@@ -166,6 +198,8 @@
## Type: yesno
## Default: "no"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# Should we suspend to disk even if it seems the kernel in /boot
# is not matching the running kernel? This is very dangerous, if
# the kernels don't match, resume will not work. Use only if you
@@ -177,6 +211,8 @@
## Type: yesno
## Default: "no"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# Should we switch to a text console _in userspace_ before entering
# a sleep mode? The kernel usually does this anyway, but if you need
# to run some initialization code before switching back to X, this
@@ -190,6 +226,8 @@
## Type: integer
## Default: 500
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# The size of the image in MB that will be written to disk upon suspend.
# A bigger image will make your system feel more responsive after resume,
# but take additional time for writing and reading your data.
@@ -205,6 +243,8 @@
## Type: string
## Default: ""
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# to make sure that there is enough swap available, you can configure an
# additional swap partition, which will only be used for suspend. This
# partition should not be in /etc/fstab and should not normally be used.
@@ -220,6 +260,8 @@
## Type: string
## Default: "userspace"
#
+# DEPRECATED! Configuration for suspend is done in /etc/pm/config
+#
# choose the method used to suspend to disk. There are two choices:
# - the shiny new userspace suspend. Needs the "suspend" package
# installed and configured in /etc/suspend.conf. Is much faster
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.7/configure.ac new/powersave-0.15.8/configure.ac
--- old/powersave-0.15.7/configure.ac 2006-11-06 17:24:23.000000000 +0100
+++ new/powersave-0.15.8/configure.ac 2006-11-17 17:44:57.000000000 +0100
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
-AC_INIT(powersave, 0.15.7, hmacht@suse.de)
+AC_INIT(powersave, 0.15.8, hmacht@suse.de)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([daemon/powersaved.cpp])
AM_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.7/daemon/cpufreq_management.cpp new/powersave-0.15.8/daemon/cpufreq_management.cpp
--- old/powersave-0.15.7/daemon/cpufreq_management.cpp 2006-11-06 17:24:21.000000000 +0100
+++ new/powersave-0.15.8/daemon/cpufreq_management.cpp 2006-11-17 17:44:56.000000000 +0100
@@ -122,25 +122,37 @@
if (eM != NULL) {
switch (mode) {
- case _DYNAMIC: {
- eM->executeEvent("processor.dynamic");
- if (config_obj->current_scheme->CPUFREQ_CONTROL == CPUFREQ_KERNEL)
- governor.append("ondemand");
- else if (config_obj->current_scheme->CPUFREQ_CONTROL == CPUFREQ_USERSPACE)
- governor.append("userspace");
+ case _DYNAMIC:
+ eM->executeEvent("processor.dynamic");
break;
- }
case _PERFORMANCE:
eM->executeEvent("processor.performance");
governor.append("performance");
break;
case _POWERSAVE:
eM->executeEvent("processor.powersave");
- governor.append("powersave");
break;
}
}
+ switch (mode) {
+ case _DYNAMIC: {
+ if (config_obj->current_scheme->CPUFREQ_CONTROL == CPUFREQ_KERNEL)
+ governor.append("ondemand");
+ else if (config_obj->current_scheme->CPUFREQ_CONTROL == CPUFREQ_USERSPACE)
+ governor.append("userspace");
+ printf("gov: %s\n", governor.c_str());
+ break;
+ }
+ case _PERFORMANCE:
+ governor.append("performance");
+ break;
+ case _POWERSAVE:
+ governor.append("powersave");
+ break;
+ }
+
+
if (!setGovernor((char*)governor.c_str())) {
pDebug(DBG_ERR, "Could not set governor '%s'", governor.c_str());
if (governor == "ondemand") {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.7/docs/powersave.8 new/powersave-0.15.8/docs/powersave.8
--- old/powersave-0.15.7/docs/powersave.8 2006-11-06 17:26:51.000000000 +0100
+++ new/powersave-0.15.8/docs/powersave.8 2006-11-17 17:45:39.000000000 +0100
@@ -17,29 +17,22 @@
Some options may work correctly only with the latest kernels.
Some options are quite hardware dependent and you should be able to test their support
by using this tool.
-For automatic global power management please install and start the
-powersave daemon on your system.
+Some information is only available if the powersave daemon is running.
Once you started the daemon you should only use the powersave daemon depending functions
or functions which just provide information about the system.
-The cpufreq control functions like performance-, powersave-, dynamic-speed are used
-by the powersave daemon. You may want to use them, but remember that
-powersave policy should be configured in the configuration files and your settings
-may be overridden by the daemon.
-.SH OPTIONS THAT NEED A RUNNING POWERSAVE DAEMON
-
-Be aware that the powersave system group exists and that
-users allowed to use these functions are part of the powersave group.
+.SH OPTIONS THAT NEED A RUNNING HAL DAEMON
.TP
.I --suspend-to-disk -U
-Sets the machine into suspend (APM) or S4/"Suspend to Disk" (ACPI) mode
+Sends a hibernate (suspend to disk) request to HAL
.TP
.I --suspend-to-ram -u
+Sends a suspend (suspend to ram) request to HAL
Sets the machine into suspend (APM) or S3/"Suspend to RAM" (ACPI) mode
.TP
.I --standby -m
-Sets the machine into standby (APM) or S1/"Standby" (ACPI) mode
+Sends a standby request to HAL
.TP
.I --performance-speed -f
Makes the daemon to set the machine fixed to the the highest supported frequency.
@@ -64,6 +57,21 @@
.I --cpufreq-state-info -c
Get the currently used CPUFreq policy.
+.TP
+.I get-brightness -K
+Get the current brightness level of the display if supported. This works
+at the moment with many toshiba, sony and asus notebooks.
+
+.TP
+.I get-brightness-levels -L
+Get number of supported brightness levels.
+
+.TP
+.I set-brightness -k
+Set the current brightness level. Get abailable brightness levels with -L
+or give character 'u' for "brightness up" or character 'd' for "brightness
+down"
+
.SH OPTIONS THAT NEED ACPI WORKING AND THE APPROPRIATE KERNEL MODULES LOADED
.TP
@@ -117,6 +125,7 @@
.I get-fan-info -F
detects which fan is on/off
+.SH OPTIONS THAT NEED A RUNNING POWERSAVE DAEMON
.TP
.I list-schemes -x
List all power schemes. Also shows which one is the current active one
@@ -135,20 +144,13 @@
.I set-active-scheme -e
See above. Use -x to list all schemes you can switch to.
-.TP
-.I get-brightness -K
-Get the current brightness level of the display if supported. This works
-at the moment with many toshiba, sony and asus notebooks.
-
-.TP
-.I get-brightness-levels -L
-Get number of supported brightness levels.
+--cpu-enable -E <x>
+Enables a single CPU. CPUs start from 0, but 0 can't be disabled because
+it runs the main timer.
-.TP
-.I set-brightness -k
-Set the current brightness level. Get abailable brightness levels with -L
-or give character 'u' for "brightness up" or character 'd' for "brightness
-down"
+--cpu-disable -D <x>
+Disables a single CPU. CPUs start from 0, but 0 can't be disabled because
+it runs the main timer.
.SH GENERAL OPTIONS - NEED NO KERNEL MODULS OR A RUNNING POWERSAVE DAEMON
@@ -194,14 +196,6 @@
2 if system is in minimum frequency (powersave) mode and 3 if frequency is adjusted
depending on CPU usage (dynamic mode)
---cpu-enable -E <x>
-Enables a single CPU. CPUs start from 0, but 0 can't be disabled because
-it runs the main timer.
-
---cpu-disable -D <x>
-Disables a single CPU. CPUs start from 0, but 0 can't be disabled because
-it runs the main timer.
-
This might change when using multiple options at once (see next).
.SH MULTIPLE OPTIONS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/powersave-0.15.7/docs/powersave.8.in new/powersave-0.15.8/docs/powersave.8.in
--- old/powersave-0.15.7/docs/powersave.8.in 2006-11-06 17:24:20.000000000 +0100
+++ new/powersave-0.15.8/docs/powersave.8.in 2006-11-17 17:44:55.000000000 +0100
@@ -17,29 +17,22 @@
Some options may work correctly only with the latest kernels.
Some options are quite hardware dependent and you should be able to test their support
by using this tool.
-For automatic global power management please install and start the
-powersave daemon on your system.
+Some information is only available if the powersave daemon is running.
Once you started the daemon you should only use the powersave daemon depending functions
or functions which just provide information about the system.
-The cpufreq control functions like performance-, powersave-, dynamic-speed are used
-by the powersave daemon. You may want to use them, but remember that
-powersave policy should be configured in the configuration files and your settings
-may be overridden by the daemon.
-.SH OPTIONS THAT NEED A RUNNING POWERSAVE DAEMON
-
-Be aware that the powersave system group exists and that
-users allowed to use these functions are part of the powersave group.
+.SH OPTIONS THAT NEED A RUNNING HAL DAEMON
.TP
.I --suspend-to-disk -U
-Sets the machine into suspend (APM) or S4/"Suspend to Disk" (ACPI) mode
+Sends a hibernate (suspend to disk) request to HAL
.TP
.I --suspend-to-ram -u
+Sends a suspend (suspend to ram) request to HAL
Sets the machine into suspend (APM) or S3/"Suspend to RAM" (ACPI) mode
.TP
.I --standby -m
-Sets the machine into standby (APM) or S1/"Standby" (ACPI) mode
+Sends a standby request to HAL
.TP
.I --performance-speed -f
Makes the daemon to set the machine fixed to the the highest supported frequency.
@@ -64,6 +57,21 @@
.I --cpufreq-state-info -c
Get the currently used CPUFreq policy.
+.TP
+.I get-brightness -K
+Get the current brightness level of the display if supported. This works
+at the moment with many toshiba, sony and asus notebooks.
+
+.TP
+.I get-brightness-levels -L
+Get number of supported brightness levels.
+
+.TP
+.I set-brightness -k
+Set the current brightness level. Get abailable brightness levels with -L
+or give character 'u' for "brightness up" or character 'd' for "brightness
+down"
+
.SH OPTIONS THAT NEED ACPI WORKING AND THE APPROPRIATE KERNEL MODULES LOADED
.TP
@@ -117,6 +125,7 @@
.I get-fan-info -F
detects which fan is on/off
+.SH OPTIONS THAT NEED A RUNNING POWERSAVE DAEMON
.TP
.I list-schemes -x
List all power schemes. Also shows which one is the current active one
@@ -135,20 +144,13 @@
.I set-active-scheme -e
See above. Use -x to list all schemes you can switch to.
-.TP
-.I get-brightness -K
-Get the current brightness level of the display if supported. This works
-at the moment with many toshiba, sony and asus notebooks.
-
-.TP
-.I get-brightness-levels -L
-Get number of supported brightness levels.
+--cpu-enable -E <x>
+Enables a single CPU. CPUs start from 0, but 0 can't be disabled because
+it runs the main timer.
-.TP
-.I set-brightness -k
-Set the current brightness level. Get abailable brightness levels with -L
-or give character 'u' for "brightness up" or character 'd' for "brightness
-down"
+--cpu-disable -D <x>
+Disables a single CPU. CPUs start from 0, but 0 can't be disabled because
+it runs the main timer.
.SH GENERAL OPTIONS - NEED NO KERNEL MODULS OR A RUNNING POWERSAVE DAEMON
@@ -194,14 +196,6 @@
2 if system is in minimum frequency (powersave) mode and 3 if frequency is adjusted
depending on CPU usage (dynamic mode)
---cpu-enable -E <x>
-Enables a single CPU. CPUs start from 0, but 0 can't be disabled because
-it runs the main timer.
-
---cpu-disable -D <x>
-Disables a single CPU. CPUs start from 0, but 0 can't be disabled because
-it runs the main timer.
-
This might change when using multiple options at once (see next).
.SH MULTIPLE OPTIONS
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org