Hello community, here is the log from the commit of package pm-profiler for openSUSE:Factory checked in at Tue Oct 5 23:36:58 CEST 2010. -------- --- pm-profiler/pm-profiler.changes 2009-08-12 17:09:27.000000000 +0200 +++ pm-profiler/pm-profiler.changes 2010-10-05 15:45:40.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Oct 5 13:45:18 UTC 2010 - trenn@novell.com + +- Forgot to add cpufreq_ondemand_vars_global.patch + +------------------------------------------------------------------- +Fri Dec 11 12:19:06 CET 2009 - trenn@suse.de + +- .spec file cleanup +- Adding export NO_BRP_STALE_LINK_ERROR="yes" for compatibility + reasons with the internal build service + +------------------------------------------------------------------- +Thu Dec 10 17:29:39 CET 2009 - trenn@suse.de + +- Remove ondemand sampling rate complication again and just let + the user set the kernel value. +- Only set ondemand tunings once, not per cpu. + +------------------------------------------------------------------- +Thu Dec 10 17:04:10 CET 2009 - trenn@suse.de + +- Add a link from /etc/pm-profiler.conf to /etc/sysconfig/pm-profiler + to get some autoyast functionality (fate#307097). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- config_add_sysconfig_description.patch cpufreq_ondemand_vars_global.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-profiler.spec ++++++ --- /var/tmp/diff_new_pack.9OGBLa/_old 2010-10-05 23:36:25.000000000 +0200 +++ /var/tmp/diff_new_pack.9OGBLa/_new 2010-10-05 23:36:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pm-profiler (Version 0.1_git20090812) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,15 @@ Name: pm-profiler Summary: Managing power options on servers Version: 0.1_git20090812 -Release: 1 -License: GPL v2 only +Release: 8 +License: GPLv2 Url: http://www.stilltobefound.org Group: System/Management Source: %{name}-%{version}.tar.bz2 +Patch1: config_add_sysconfig_description.patch +Patch2: cpufreq_ondemand_vars_global.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq +PreReq: %insserv_prereq %fillup_prereq BuildArch: noarch AutoReqProv: on Obsoletes: powersave <= 0.15.20 @@ -46,16 +48,39 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %install +# We introduce a link which is stale after install +# and gets valid in %pre/%post scripts. Tell the build +# service or it will stop with an error. + +export NO_BRP_STALE_LINK_ERROR="yes" + %makeinstall + +mkdir -p %{buildroot}/var/adm/fillup-templates +mv $RPM_BUILD_ROOT/%{_sysconfdir}/pm-profiler.conf $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pm-profiler +ln -sf /etc/sysconfig/pm-profiler $RPM_BUILD_ROOT/%{_sysconfdir}/pm-profiler.conf + %find_lang %name +%pre +if test -f /etc/pm-profiler.conf -a ! -L /etc/pm-profiler.conf; then + grep "^PM_PROFILER_PROFILE" /etc/pm-profiler.conf > /etc/sysconfig/pm-profiler + rm /etc/pm-profiler.conf + ln -sf /etc/sysconfig/pm-profiler /etc/pm-profiler.conf +fi + %preun %stop_on_removal pm-profiler +%post +%{fillup_only -n pm-profiler} + %postun %{insserv_cleanup} @@ -66,7 +91,7 @@ %defattr(-,root,root) %_docdir/pm-profiler /usr/lib/pm-profiler -%config(noreplace) %_sysconfdir/pm-profiler.conf +%config %_sysconfdir/pm-profiler.conf %dir %_sysconfdir/pm-profiler %dir %_sysconfdir/pm-profiler/balanced_low_latency %config %_sysconfdir/pm-profiler/balanced_low_latency/config @@ -77,5 +102,7 @@ %_sysconfdir/init.d/pm-profiler %_sbindir/rcpm-profiler %_bindir/pm-profiler +#/etc/sysconfig/pm-profiler.conf +/var/adm/fillup-templates/sysconfig.pm-profiler %changelog ++++++ config_add_sysconfig_description.patch ++++++ --- config/pm-profiler.conf | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) Index: pm-profiler-0.1_git20090812/config/pm-profiler.conf =================================================================== --- pm-profiler-0.1_git20090812.orig/config/pm-profiler.conf +++ pm-profiler-0.1_git20090812/config/pm-profiler.conf @@ -1,18 +1,15 @@ +## Path: Hardware/Power +## Description: Defines a Power Management profile to use +## Type: string +## Default: "" # -# !!!ATTENTION!!! -# +# Defines the profile which gets activated on system start or +# when the pm-profile service gets restarted # pm-profiler, and thus this file, is not intended to be used on desktop # systems where power management policy managers like gnome-power-manager, -# power-devil, etc. exist. pm-profiler is only intended for servers where +# power-devil, etc. exist. pm-profiler is only intended for servers # with dedicated use cases -# - -# -# Defines the profile which gets activated on system start -# +# If empty, the default system/kernel settings will be used. # Possible values: 1. Profile name # 2. Empty -# -# If empty, the default system/kernel settings will be used. -# PM_PROFILER_PROFILE="" ++++++ cpufreq_ondemand_vars_global.patch ++++++ --- tools/enable-profile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) Index: pm-profiler-0.1_git20090812/tools/enable-profile =================================================================== --- pm-profiler-0.1_git20090812.orig/tools/enable-profile +++ pm-profiler-0.1_git20090812/tools/enable-profile @@ -42,25 +42,15 @@ function cpufreq_governor { } function cpufreq_ondemand_up_threshold { - for I in /sys/devices/system/cpu/cpu*/cpufreq/ondemand/up_threshold; do - echo $CPUFREQ_ONDEMAND_UP_THRESHOLD > $I - done + echo $CPUFREQ_ONDEMAND_UP_THRESHOLD > /sys/devices/system/cpu/cpu0/cpufreq/ondemand/up_threshold; } function cpufreq_ondemand_sampling_rate { - local SAMPLE_RATE - for I in /sys/devices/system/cpu/cpu*/cpufreq; do - if [ -e $I/cpuinfo_transition_latency ] && \ - [ -w $I/ondemand/sampling_rate ]; then - SAMPLE_RATE=$(($(cat $I/cpuinfo_transition_latency) \ - * $CPUFREQ_ONDEMAND_SAMPLING_RATE / 1000)) - echo $SAMPLE_RATE > $I/ondemand/sampling_rate - fi - done + echo $CPUFREQ_ONDEMAND_SAMPLING_RATE >/sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate; } function cpufreq_ondemand_powersave_bias { - for I in /sys/devices/system/cpu/cpu*/cpufreq/ondemand/powersave_bias; do + for I in /sys/devices/system/cpu/cpu0/cpufreq/ondemand/powersave_bias; do echo $CPUFREQ_ONDEMAND_POWERSAVE_BIAS > $I done } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org