Hello community, here is the log from the commit of package hal for openSUSE:Factory checked in at Thu Oct 14 14:10:42 CEST 2010. -------- --- hal/hal-doc.changes 2010-06-18 05:32:54.000000000 +0200 +++ hal/hal-doc.changes 2010-10-14 14:10:11.617454000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 12 13:20:23 CEST 2010 - vuntz@opensuse.org + +- Move the cpufreq loading out of rchal: it will now live in its + own init script, shipped by pm-utils. This will help with + bnc#612131. + +------------------------------------------------------------------- hal.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.Dwfcqq/_old 2010-10-14 14:10:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Dwfcqq/_new 2010-10-14 14:10:17.000000000 +0200 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 6 +Release: 11 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons hal.spec: same change ++++++ rc.hal ++++++ --- /var/tmp/diff_new_pack.Dwfcqq/_old 2010-10-14 14:10:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Dwfcqq/_new 2010-10-14 14:10:17.000000000 +0200 @@ -5,7 +5,7 @@ # ### BEGIN INIT INFO # Provides: haldaemon -# Required-Start: boot.localnet dbus +# Required-Start: boot.localnet cpufreq dbus # Should-Start: acpid resmgr # Required-Stop: $null # Should-Stop: $null @@ -32,86 +32,6 @@ HALDAEMON_PIDDIR="/var/run/hald"; HALDAEMON_PID=$HALDAEMON_PIDDIR/haldaemon.pid; DBUSDAEMON_PID=/var/run/dbus/pid; -CPUFREQ_SYSFS_PATH="/sys/devices/system/cpu/cpu0/cpufreq" -LOGGER="/bin/logger -t rchal" - -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" - - ###### load CPUFREQ modules############ - # 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 - ###### load CPUFREQ modules############ -} # Source LSB init functions # providing start_daemon, killproc, pidofproc, @@ -145,19 +65,6 @@ fi fi - ##### CPUFreq stuff ##### - if [ "$CPUFREQ" != "no" -a "$CPUFREQ" != "off" ]; then - echo -n "Loading CPUFreq modules" - load_cpufreq_driver - load_governors - - if [ "$?" = 0 ]; then - rc_status -v - else - echo " (CPUFreq not supported)" - fi - fi - echo -n "Starting HAL daemon" $HALDAEMON_BIN $HALDAEMON_PARA ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org