[arch-commits] Commit in cpufrequtils/repos (4 files)

[Giovanni Scafora]

    Date: Tuesday, December 15, 2009 @ 09:39:19
  Author: giovanni
Revision: 61308

Merged revisions 61306 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cpufrequtils/trunk

........
  r61306 | giovanni | 2009-12-15 06:37:50 -0800 (mar, 15 dic 2009) | 2 lines
  
  upgpkg: cpufrequtils 006-3
      Fixed FS10959 and FS14083
........

Modified:
  cpufrequtils/repos/extra-x86_64/	(properties)
  cpufrequtils/repos/extra-x86_64/PKGBUILD
  cpufrequtils/repos/extra-x86_64/cpufreq.confd
  cpufrequtils/repos/extra-x86_64/cpufreq.rcd

---------------+
 PKGBUILD      |    6 +++---
 cpufreq.confd |    8 +++++---
 cpufreq.rcd   |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)


Property changes on: cpufrequtils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /cpufrequtils/trunk:1-61252
   + /cpufrequtils/trunk:1-61307

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-15 14:38:31 UTC (rev 61307)
+++ extra-x86_64/PKGBUILD	2009-12-15 14:39:19 UTC (rev 61308)
@@ -5,7 +5,7 @@
 
 pkgname=cpufrequtils
 pkgver=006
-pkgrel=2
+pkgrel=3
 pkgdesc="Userspace tools for the kernel cpufreq subsystem"
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
@@ -17,8 +17,8 @@
         cpufreq.confd)
 options=(!libtool)
 md5sums=('124b0de8f3a4d672539a85ce13eed869'
-         '8f56a79aacb61ad70b74649b694f8b73'
-         '1815e1769d5e5c8b754877a1f77266fa')
+         '5bc75e3f314dc256c2f03ee8194a47b4'
+         'baae1f2abffc6bef2bd32a8dd8263c09')
 
 build()
 {

Modified: extra-x86_64/cpufreq.confd
===================================================================
--- extra-x86_64/cpufreq.confd	2009-12-15 14:38:31 UTC (rev 61307)
+++ extra-x86_64/cpufreq.confd	2009-12-15 14:39:19 UTC (rev 61308)
@@ -3,10 +3,12 @@
 # valid governors:
 #  ondemand, performance, powersave,
 #  conservative, userspace
-governor="ondemand"
+#governor="ondemand"
 
+# limit frequency range (optional)
 # valid suffixes: Hz, kHz (default), MHz, GHz, THz
-min_freq="2.25GHz"
-max_freq="3GHz"
+#min_freq="2.25GHz"
+#max_freq="3GHz"
+
 # use freq to set up the exact cpu frequency using it with userspace governor
 #freq=

Modified: extra-x86_64/cpufreq.rcd
===================================================================
--- extra-x86_64/cpufreq.rcd	2009-12-15 14:38:31 UTC (rev 61307)
+++ extra-x86_64/cpufreq.rcd	2009-12-15 14:39:19 UTC (rev 61308)
@@ -14,7 +14,7 @@
 	if [ -n $governor ]; then
 		mod="cpufreq_$governor"
 		params="-g $governor"
-		modprobe $mod > /dev/null 2>&1
+		grep -qw "$governor" /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors || modprobe -q $mod
 		if [ $? -eq 0 ]; then
 			if [ "$min_freq" != "" ]; then
 				params="$params -d $min_freq"