9 files changed, 10 insertions, 51 deletions
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index dfcb95561..d3154ac86 100644..100755
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgbase=linux-libre-tools
 pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
-_basekernel=3.5
+_basekernel=3.6
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=4
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -29,16 +29,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'cpupower.rc'
         'cpupower.systemd'
         'cpupower.service'
-        'cpupower.pmutils'
         'usbipd.conf'
         'usbipd.rc'
         'usbipd.service')
-md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '18d5aa9e4c6bb23bb02bf65e155e0f0e'
-         '1d9214637968b91706b6e616a100d44b'
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+         '56883c159381ba89e50ab8ea65efec77'
+         '5fc1fcda4cef93f16e752b1931db23e3'
          'c0d17b5295fe964623c772a2dd981771'
          '2450e8ff41b30eb58d43b5fffbfde1f4'
-         '1c2743ce57b56e16feec86a8b49f3391'
          'e8fac9c45a628015644b4150b139278a'
          '8a3831d962ff6a9968c0c20fd601cdec'
          'ba7c1c513314dd21fb2334fb8417738f')
@@ -104,7 +102,7 @@ package_cpupower-libre() {
   pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
   depends=('bash' 'pciutils')
-  replaces=('cpupower')
+  replaces=('cpupower' 'cpufrequtils')
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
 
@@ -120,8 +118,6 @@ package_cpupower-libre() {
   install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
   install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
   install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
-  # install pm-utils hook
-  install -Dm 755 cpupower.pmutils "$pkgdir/usr/lib/pm-utils/power.d/cpupower"
 }
 
 package_x86_energy_perf_policy-libre() {
@@ -156,4 +152,4 @@ package_usbip-libre() {
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf
index f4e9cc4c8..b5c522ea1 100644..100755
--- a/libre/linux-libre-tools/cpupower.conf
+++ b/libre/linux-libre-tools/cpupower.conf
@@ -8,10 +8,11 @@
 #max_freq="3GHz"
 
 # Specific frequency to be set.
-# Requires userspace governor to be available and loaded.
+# Requires userspace governor to be available.
+# Do not set governor field if you use this one.
 #freq=
 
-# Utilizes cores in one processor package/socket first before processes are
+# Utilizes cores in one processor package/socket first before processes are 
 # scheduled to other processor packages/sockets.
 # See man (1) CPUPOWER-SET for additional details.
 #mc_scheduler=
diff --git a/libre/linux-libre-tools/cpupower.pmutils b/libre/linux-libre-tools/cpupower.pmutils
deleted file mode 100644
index fb93cd7c1..000000000
--- a/libre/linux-libre-tools/cpupower.pmutils
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-[[ -x /usr/bin/cpupower ]] || exit $NA
-
-CPUPOWER_GOVERNOR_AC=${CPUPOWER_GOVERNOR_AC:-ondemand}
-CPUPOWER_GOVERNOR_BAT=${CPUPOWER_GOVERNOR_BAT:-conservative}
-
-help() {
-    cat <<EOF
---------
-$0: Select cpupower frequency governor.
-
-Parameters:
-CPUPOWER_GOVERNOR_AC = Governor to use on AC.
-Defaults to ondemand.
-
-CPUPOWER_GOVERNOR_BAT = Governor to use on battery.
-Defaults to conservative.
-
-EOF
-}
-
-cpupow() {
-  printf 'Setting cpupower frequency governor to %s...' "$1"
-  cpupower -c all frequency-set -g "$1"
-}
-
-case $1 in
-  true) cpupow "$CPUPOWER_GOVERNOR_BAT" ;;
-  false) cpupow "$CPUPOWER_GOVERNOR_AC" ;;
-  help) help;;
-  *) exit $NA ;;
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
index 2c4441c4e..88edaf791 100644..100755
--- a/libre/linux-libre-tools/cpupower.rc
+++ b/libre/linux-libre-tools/cpupower.rc
@@ -2,7 +2,6 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
 
 case "$1" in
   start|restart)
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
index aaeba2b08..aaeba2b08 100644..100755
--- a/libre/linux-libre-tools/cpupower.service
+++ b/libre/linux-libre-tools/cpupower.service
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
index f45b02bc8..f45b02bc8 100644..100755
--- a/libre/linux-libre-tools/cpupower.systemd
+++ b/libre/linux-libre-tools/cpupower.systemd
diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf
index 5990b857a..5990b857a 100644..100755
--- a/libre/linux-libre-tools/usbipd.conf
+++ b/libre/linux-libre-tools/usbipd.conf
diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc
index 15a1bcf00..15a1bcf00 100644..100755
--- a/libre/linux-libre-tools/usbipd.rc
+++ b/libre/linux-libre-tools/usbipd.rc
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
index ac2f5f7c1..ac2f5f7c1 100644..100755
--- a/libre/linux-libre-tools/usbipd.service
+++ b/libre/linux-libre-tools/usbipd.service