Hello community,
here is the log from the commit of package pm-utils for openSUSE:Factory
checked in at Thu Oct 14 12:49:34 CEST 2010.
--------
--- pm-utils/pm-utils.changes 2010-07-05 15:53:07.000000000 +0200
+++ pm-utils/pm-utils.changes 2010-10-12 13:47:52.000000000 +0200
@@ -1,0 +2,46 @@
+Tue Oct 12 13:45:13 CEST 2010 - vuntz@opensuse.org
+
+- Add a cpufreq init script, with code that was originally in hal
+ init script. Since hal is getting killed, we need to move this
+ elsewhere. This will help with bnc#612131.
+ + Install rc.cpufreq as /etc/init.d/cpufreq and link it from
+ /usr/sbin/rccpufreq.
+ + Add %insserv_prereq PreReq.
+ + Add scriptlets to handle this init script. We enable it by
+ default.
+
+-------------------------------------------------------------------
+Mon Sep 20 11:40:15 UTC 2010 - mvyskocil@suse.cz
+
+- Update to 1.4.1
+ * New power.d hooks:
+ - disable_wol (obsoletes wol, $WOL)
+ - hal-cd-polling
+ - harddrive,
+ - intel-audio-powersave (obsoletes sound-pm, $SOUND_PM),
+ - journal-commit,
+ - laptop-mode
+ - pcie_aspm,
+ - readahead,
+ - sata_alpm (obsoletes sata_pm, $SATA_PM)
+ - wireless (obsoletes iwl-pm, $IWL_PM)
+ - xfs_buffer
+ * Load hook blacklist for power.d hooks
+ * Fix paths for sched_powersave script
+ * Try falling back to standby suspend of mem is not available.
+ * Use flock for more robust lock file handling
+ * Make tuxonice methods chvt if using a userspace UI.
+ * Autodetect sleep modules by default instead of forcing the kernel one.
+ * Rewrote the sched-powersave hook to eliminate redundancy.
+ * Help functionality to pm-powersave
+- SUSE aditions
+ * set and check the governors via sysfs - bnc#619750
+ * do a sanity check on S2DISK_CONF
+ * fix bnc#617667: 50rcnetwork sleep hook cannot work
+ * remove power.d hooks already in upstream pm-utils 1.4.0+
+ - iwl-pm and $IWL_PM config variable replaced by wireless hook, no config variable
+ - sata-pm and $SATA_PM replaced by sata_alpm, $SATA_ALPM_ENABLE
+ - sound-pm and $SOUND_PM replaced by intel-audio-powersave, $INTEL_AUDIO_POWERSAVE
+ - wol and $WOL replaced by disable_wol, no config variable
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pm-utils-1.3.0-direct-on_ac_power.patch
pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff
pm-utils-1.3.0-pm-utils-suse-fix-rcnetwork.patch
pm-utils-1.3.0-suse-config.patch
pm-utils-1.3.0-suse-drop-import-fdi-quirkdb.patch
pm-utils-1.3.0-upower.patch
pm-utils-1.3.0.tar.bz2
pm-utils-suse-16d7a9fadba89df1e587accb2e832cf26c7d4420.tar.bz2
New:
----
pm-utils-1.4.1-suse-config.patch
pm-utils-1.4.1.tar.bz2
pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2
rc.cpufreq
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pm-utils.spec ++++++
--- /var/tmp/diff_new_pack.1aLUIv/_old 2010-10-14 12:37:20.000000000 +0200
+++ /var/tmp/diff_new_pack.1aLUIv/_new 2010-10-14 12:37:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package pm-utils (Version 1.3.0)
+# spec file for package pm-utils (Version 1.4.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -22,46 +22,33 @@
%define pm_sysconfdir %{_sysconfdir}/pm/config.d/
Name: pm-utils
-Version: 1.3.0
-Release: 8
+Version: 1.4.1
+Release: 1
Summary: Tools to suspend and hibernate computers
License: GPLv2+
Group: System/Base
Url: http://pm-utils.freedesktop.org/wiki/
-Source: %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM: upower suport
-# http://www.mail-archive.com/pm-utils@lists.freedesktop.org/msg02018.html
-# http://cgit.freedesktop.org/pm-utils/commit/?id=e8d0b58a9df080f021d04b4c2d35...
-Patch0: pm-utils-1.3.0-upower.patch
-#PATCH-FIX-OPENSUSE: on_ac_power don't produce veird errors if HAL or D-BUS are broken
-Patch1: pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff
+Source0: %{name}-%{version}.tar.bz2
+# http://gitorious.org/opensuse/pm-utils-suse
+Source1: pm-utils-suse-c4a2acedc2a25d61c7a82f050a2d98d2690ed16d.tar.bz2
+Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2
+Source3: rc.cpufreq
#PATCH-FIX-OPENSUSE: fixes a dbus-send call
-Patch2: pm-utils-1.2.6.1-fix-broken-dbus-send.diff
+Patch0: pm-utils-1.2.6.1-fix-broken-dbus-send.diff
#PATCH-FIX-OPENSUSE: make the uswsusp module default on SUSE and port the "smart" behavior
-Patch3: pm-utils-1.3.0-suse-smart-uswsusp.patch
+Patch1: pm-utils-1.3.0-suse-smart-uswsusp.patch
#PATCH-FIX-OPENSUSE: add some aditional config variables for pm-utils-suse
-Patch4: pm-utils-1.3.0-suse-config.patch
+Patch2: pm-utils-1.4.1-suse-config.patch
#PATCH-FIX-OPENSUSE: more SUSE friendly grub handler
-Patch5: pm-utils-1.3.0-suse-grub.patch
+Patch3: pm-utils-1.3.0-suse-grub.patch
#PATCH-FIX-OPENSUSE: setup also kernel loglevel to show up the progress bar
-Patch6: pm-utils-1.3.0-suse-logging.patch
-#PATCH-FIX-OPENSUSE: drop import-fdi-quirkdb from installation, SUSE has it included
-#Note: it will be removed in next release, no needed to ustream
-Patch7: pm-utils-1.3.0-suse-drop-import-fdi-quirkdb.patch
+Patch4: pm-utils-1.3.0-suse-logging.patch
#PATCH-FIX-OPENSUSE: export SUSE_IGNORE_FBMODES to workaround bnc#304995
-Patch8: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch
-#PATCH-FIX-UPSTREAM: on_ac_power uses sysfs directly to prevent a deadlock bnc#615646
-#http://cgit.freedesktop.org/pm-utils/diff/?id=87883a1cc89618b5a985a9c78f8234...
-#FIXME: this patch invalidates patch1 as well as a part of patch0, remove them on update
-Patch9: pm-utils-1.3.0-direct-on_ac_power.patch
-# the merge requests on gitorious are ignored, so I patch it here instead of
-# wasting energy sending it there.
-Patch99: pm-utils-1.3.0-pm-utils-suse-fix-rcnetwork.patch
-# http://gitorious.org/opensuse/pm-utils-suse
-Source1: pm-utils-suse-16d7a9fadba89df1e587accb2e832cf26c7d4420.tar.bz2
-Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2
+Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+PreReq: %insserv_prereq
+
# hooks requires some external tools
Requires: grep
Requires: sed
@@ -70,21 +57,13 @@
Requires: coreutils
Requires: module-init-tools
-%if 0%{?suse_version} <= 1120
-Requires: DeviceKit-disks
-Requires: DeviceKit-power
-%else
-Requires: udisks
Requires: upower
-%endif
%description
pm-utils provide simple shell command line tools to suspend and
hibernate computers that can be used to run vendor or distro supplied
scripts on suspend and resume.
-
-
Authors:
--------
Bill Nottingham
@@ -107,19 +86,12 @@
%prep
%setup -q -b 1 -a 2
-%patch0 -p1 -b .upower
-%patch1 -p1 -b .no-dbus-fallback
-%patch2 -p1 -b .broken-dbus
-%patch3 -p1 -b .smart-swsusp
-%patch4 -p1 -b .suse-config
-%patch5 -p1 -b .suse-grub
-%patch6 -p1 -b .suse-logging
-%patch7 -p1 -b .drop-import-fdi-quirkdb
-%patch8 -p1 -b .directfb-ignore-fbmodes
-%patch9 -p1 -b .on_ac_power-direct-sysfs
-cd ../pm-utils-suse
-# no backup, because the file would be installed
-%patch99 -p1
+%patch0 -p1 -b .broken-dbus
+%patch1 -p1 -b .smart-swsusp
+%patch2 -p1 -b .suse-config
+%patch3 -p1 -b .suse-grub
+%patch4 -p1 -b .suse-logging
+%patch5 -p1 -b .directfb-ignore-fbmodes
%build
%{configure} \
@@ -138,7 +110,6 @@
#SUSE hooks
pushd ../pm-utils-suse
%{__install} -m 0755 hooks/sleep.d/* %{buildroot}/%{pm_libdir}/sleep.d/
-%{__install} -m 0755 hooks/power.d/* %{buildroot}/%{pm_libdir}/power.d/
%{__install} -m 0644 hooks/config.d/* %{buildroot}/%{pm_sysconfdir}/
# powersave command is back
%{__install} -m 0755 bin/powersave %{buildroot}/%{_bindir}
@@ -150,15 +121,30 @@
# no arch-specific data, we put it in datadir.
%{__install} -d -m 0755 %{buildroot}%{_datadir}/pkgconfig
mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}%{_datadir}/pkgconfig
+# install cpufreq init script
+install -D -m 0755 %{S:3} %{buildroot}%{_sysconfdir}/init.d/cpufreq
+install -d -m 0755 %{buildroot}%{_sbindir}
+ln -sf %{_sysconfdir}/init.d/cpufreq %{buildroot}%{_sbindir}/rccpufreq
%clean
rm -rf %{buildroot}
+%preun
+%stop_on_removal cpufreq
+
+%post
+%fillup_and_insserv -f -y cpufreq
+
+%postun
+%restart_on_update cpufreq
+%insserv_cleanup
+
%files
%defattr (-,root,root)
%doc README ChangeLog AUTHORS ../pm-utils-suse/doc/README.smart-suspend-to-RAM
%attr(0755,root,root) %{_bindir}/*
%{_sbindir}/*
+%config %{_sysconfdir}/init.d/cpufreq
%{_sysconfdir}/pm/
%config(noreplace) %{_sysconfdir}/pm/config.d/rtcwake.config
%{pm_libdir}
++++++ pm-utils-1.2.6.1-fix-broken-dbus-send.diff ++++++
--- /var/tmp/diff_new_pack.1aLUIv/_old 2010-10-14 12:37:20.000000000 +0200
+++ /var/tmp/diff_new_pack.1aLUIv/_new 2010-10-14 12:37:20.000000000 +0200
@@ -1,20 +1,20 @@
-Index: pm-utils-1.2.6.1/pm/sleep.d/55NetworkManager
+Index: pm-utils-1.4.1/pm/sleep.d/55NetworkManager
===================================================================
---- pm-utils-1.2.6.1.orig/pm/sleep.d/55NetworkManager 2009-06-14 03:56:09.000000000 +0200
-+++ pm-utils-1.2.6.1/pm/sleep.d/55NetworkManager 2009-11-19 14:54:22.541343347 +0100
-@@ -12,6 +12,7 @@
- {
+--- pm-utils-1.4.1.orig/pm/sleep.d/55NetworkManager 2010-09-20 11:12:23.750155840 +0200
++++ pm-utils-1.4.1/pm/sleep.d/55NetworkManager 2010-09-20 11:12:25.610155850 +0200
+@@ -13,6 +13,7 @@
# Tell NetworkManager to shut down networking
+ printf "Having NetworkManager put all interaces to sleep..."
dbus_send --system \
+ --print-reply --reply-timeout=200 \
--dest=org.freedesktop.NetworkManager \
/org/freedesktop/NetworkManager \
- org.freedesktop.NetworkManager.sleep
-@@ -22,6 +23,7 @@
- # Wake up NetworkManager and make it do a new connection
- dbus_send --system \
+ org.freedesktop.NetworkManager.sleep && \
+@@ -25,6 +26,7 @@
+ printf "Having NetworkManager wake interfaces back up..."
+ dbus_send --system \
--dest=org.freedesktop.NetworkManager \
+ --print-reply --reply-timeout=200 \
/org/freedesktop/NetworkManager \
- org.freedesktop.NetworkManager.wake
- }
+ org.freedesktop.NetworkManager.wake && \
+ echo Done. || echo Failed.
++++++ pm-utils-1.3.0-suse-config.patch -> pm-utils-1.4.1-suse-config.patch ++++++
--- pm-utils/pm-utils-1.3.0-suse-config.patch 2010-04-01 16:44:44.000000000 +0200
+++ pm-utils/pm-utils-1.4.1-suse-config.patch 2010-09-20 15:16:39.000000000 +0200
@@ -2,30 +2,23 @@
pm/defaults | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
-Index: pm-utils-1.3.0/pm/defaults
+Index: pm-utils-1.4.1/pm/defaults
===================================================================
---- pm-utils-1.3.0.orig/pm/defaults 2010-04-01 12:12:38.903407733 +0200
-+++ pm-utils-1.3.0/pm/defaults 2010-04-01 12:33:01.706869112 +0200
-@@ -46,6 +46,25 @@
+--- pm-utils-1.4.1.orig/pm/defaults 2010-09-20 11:42:59.214155594 +0200
++++ pm-utils-1.4.1/pm/defaults 2010-09-20 13:35:52.974279436 +0200
+@@ -30,7 +30,7 @@
+ SLEEP_MODULE="uswsusp"
+
+ #######################################################################
+-# the variables below here are specific to the SUSE package right now
++# those variables below SUSE pm-utils specific right now
+ # and are used only if SLEEP_MODULE is uswsusp
+
+ # what options should be passed to s2ram?
+@@ -46,6 +46,9 @@
# if S2RAM_OPTS is set, it overrides S2RAM_QUIRKS_SOURCE!
S2RAM_QUIRKS_SOURCE=""
-+# IWL power management
-+# 6: Radio always on, default AC
-+# 1-5: BATTERY levels, the higher the value, the more power is saved
-+# Empty string is meant for not touching any power management features at all
-+IWL_PM="5"
-+
-+# SATA power management
-+# Possible values are: min_power, medium_power, max_performance
-+# Empty string is meant for not touching any power management features at all
-+SATA_PM="medium_power"
-+
-+# SOUND power management
-+# Specifies the timeout after a sound card enters a low power mode
-+# Empty string is meant for not touching any power management features at all
-+SOUND_PM="10"
-+
+# the location of the autogenerated s2disk (s2both) config file
+S2DISK_CONF="/var/lib/s2disk.conf"
+
++++++ pm-utils-1.3.0.tar.bz2 -> pm-utils-1.4.1.tar.bz2 ++++++
++++ 3771 lines of diff (skipped)
++++++ rc.cpufreq ++++++
#!/bin/sh
# Author: Danny Kukawka
# Author: Vincent Untz
#
# /etc/init.d/cpufreq
#
### BEGIN INIT INFO
# Provides: cpufreq
# Required-Start: $null
# Should-Start: $null
# Required-Stop: $null
# Should-Stop: $null
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: CPUFreq modules loader
# Description: This script loads the relevant CPUFreq modules in the kernel.
#
### END INIT INFO
# Parameters (startup)
CPUFREQ_SYSFS_PATH="/sys/devices/system/cpu/cpu0/cpufreq"
LOGGER="/bin/logger -t rc.cpufreq"
load_governors()
{
if [ ! -r $CPUFREQ_SYSFS_PATH ];then
$LOGGER Cannot load cpufreq governors - No cpufreq driver available
return 1
fi
read govs < $CPUFREQ_SYSFS_PATH/scaling_available_governors
case "$govs" in
*powersave*)
;;
*)
modprobe -q cpufreq_powersave >/dev/null 2>&1
[ $? != 0 ] && $LOGGER powersave cpufreq governor could not be loaded
;;
esac
case "$govs" in
*performance*)
;;
*)
modprobe -q cpufreq_performance >/dev/null 2>&1
[ $? != 0 ] && $LOGGER perfromance cpufreq governor could not be loaded
;;
esac
case "$govs" in
*userspace*)
;;
*)
modprobe -q cpufreq_userspace >/dev/null 2>&1
[ $? != 0 ] && $LOGGER userspace cpufreq governor could not be loaded
;;
esac
case "$govs" in
*ondemand*)
;;
*)
modprobe -q cpufreq_ondemand >/dev/null 2>&1
[ $? != 0 ] && $LOGGER ondemand cpufreq governor could not be loaded
;;
esac
case "$govs" in
*conservative*)
;;
*)
modprobe -q cpufreq_conservative >/dev/null 2>&1
[ $? != 0 ] && $LOGGER conservative cpufreq governor could not be loaded
;;
esac
return 0
}
function load_cpufreq_driver()
{
CPUFREQ_MODULES="speedstep_centrino powernow_k8 powernow_k7 powernow_k6 longrun speedstep_ich acpi_cpufreq"
CPUFREQ_MODULES_GREP="^speedstep_centrino\|^speedstep_ich\|^powernow_k8\|^powernow_k7\|^powernow_k6\|^longrun\|^longhaul\|^acpi_cpufreq"
# if the drivers are compiled in, $CPUFREQ_SYSFS_PATH already exists
if [ ! -d $CPUFREQ_SYSFS_PATH ]; then
# test for already loaded modules
ALREADY_LOADED_MODS=`grep $CPUFREQ_MODULES_GREP /proc/modules`
if [ -z "$ALREADY_LOADED_MODS" ] ; then
for MODULE in $CPUFREQ_MODULES; do
modprobe $MODULE &>/dev/null
RETVAL=$?
[ "$RETVAL" = 0 ] && break
done
# skip if no module could be loaded!
if [ "$RETVAL" != 0 ]; then
$LOGGER "CPU frequency scaling is not supported by your processor."
$LOGGER "boot with 'CPUFREQ=no' in to avoid this warning."
# remove eventually loaded modules, bug 150381
rmmod speedstep_lib cpufreq_stats freq_table 2>/dev/null
fi
fi
fi
}
. /etc/rc.status
rc_reset
case "$1" in
start)
echo -n "Loading CPUFreq modules"
load_cpufreq_driver
load_governors
if [ "$?" != 0 ]; then
rc_failed 1
fi
rc_status -v
;;
stop)
rc_failed 0
rc_status
;;
try-restart|restart|reload|force-reload)
$0 start
;;
status)
echo -n "Checking CPUFreq modules"
if [ -r $CPUFREQ_SYSFS_PATH ]; then
rc_failed 0
else
rc_failed 3
fi
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac
rc_exit
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org