Remove cpufreq-detect.sh.

grml-autoconfig no longer relies on it.

diff --git a/debian/control b/debian/control
index f0e3044..0b946fd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: grml-scripts
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, less, dialog, perl, zsh, dash, links | w3m | links2, screen, grml-network, grml-etc-core, libterm-readkey-perl, lockfile-progs, grml-scripts-core
 Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-files, grml-hwinfo, pptp-linux, flite, wmii, mutt, slrn, grml-docs, grml-autoconfig (>= 0.6.9), dirvish, sudo, idesk, xlockmore, python-dbus, notification-daemon, grml-quickconfig, libwebservice-google-suggest-perl, lzop
-Conflicts: scanmodem, grml-etc-core (<< 0.1-30)
+Conflicts: scanmodem, grml-etc-core (<< 0.1-30), grml-autoconfig (<< 0.9.19)
 Description: Scripts for the Grml system for an easier life
  Some scripts which should make life easier.
  .

diff --git a/debian/overrides b/debian/overrides
index 9334a83..65ed7b5 100644 (file)
--- a/debian/overrides
+++ b/debian/overrides
@@ -1,5 +1,4 @@
 grml-scripts: script-with-language-extension usr/bin/bincompare.pl
-grml-scripts: script-with-language-extension usr/bin/cpufreq-detect.sh
 grml-scripts: script-with-language-extension usr/bin/gsuggest.pl
 grml-scripts: script-with-language-extension usr/bin/hgrep.sh
 grml-scripts: script-with-language-extension usr/bin/irclog2html-2.1.pl

diff --git a/debian/rules b/debian/rules
index f960d9e..fa07537 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,6 @@ binary-arch: build install
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/caps-ctrl.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/cicqhist.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/code2html.1.gz \
-               /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/cpufreq-detect.sh.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/dir2html.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/dpkg_not_running.1.gz \
                /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/dpkg-rebuild.1.gz \

diff --git a/manpages/grml-scripts.1 b/manpages/grml-scripts.1
index 9f324a6..535055b 100644 (file)
--- a/manpages/grml-scripts.1
+++ b/manpages/grml-scripts.1
@@ -28,8 +28,6 @@ running it in X window system works as normal user.
 create a human-readable version of centericq history
 .SS code2html
 convert code to html
-.SS cpufreq-detect.sh
-detect cpu type and set $MODULE to appropriate kernel module for cpufrequency scaling
 .SS dir2html
 create HTML-listing for a directory
 .SS exifinfo

diff --git a/usr_bin/cpufreq-detect.sh b/usr_bin/cpufreq-detect.sh
deleted file mode 100755 (executable)
index 70d5452..0000000
--- a/usr_bin/cpufreq-detect.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Filename:      cpufreq-detect.sh
-# Purpose:       detect cpu type and set $MODULE to appropriate kernel module for cpufrequency scaling
-# Authors:       grml-team (grml.org), (C) Ubuntu, (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
-################################################################################
-# Notice: also check out /etc/init.d/loadcpufreq of current cpufrequtils in Debian.
-#
-# Notice: based on http://people.ubuntulinux.org/~scott/patches/powernowd/ and
-# scripts found in the powernowd package version 0.97-1ubuntu6 on Ubuntu.
-################################################################################
-
-/usr/sbin/laptop-detect 2>/dev/null && LAPTOP=1
-
-CPUINFO=/proc/cpuinfo
-IOPORTS=/proc/ioports
-
-if [ ! -f $CPUINFO ] ; then
-   echo >&2 $CPUINFO not detected...
-   exit 1
-fi
-
-# /lib/modules/2.6.16-grml/kernel/arch/i386/kernel/cpu/cpufreq/ ->
-# modulename          [used?]
-# acpi-cpufreq        [x]
-# cpufreq-nforce2     [ ] nForce2 FSB changing cpufreq driver
-# gx-suspmod          [ ] Cpufreq driver for Cyrix MediaGX and NatSemi Geode
-# longhaul            [x]
-# longrun             [x]
-# p4-clockmod         [~] cpufreq driver for Pentium(TM) 4/Xeon(TM)
-# powernow-k6         [x]
-# powernow-k7         [x]
-# powernow-k8         [x]
-# speedstep-centrino  [x]
-# speedstep-ich       [x]
-# speedstep-lib       [ ] Library for Intel SpeedStep 1 or 2 cpufreq drivers.
-# speedstep-smi       [x]
-#
-# /lib/modules/2.6.16-grml/kernel/drivers/cpufreq ->
-# cpufreq_conservative
-# cpufreq_ondemand
-# cpufreq_powersave
-# cpufreq_stats
-# cpufreq_userspace
-# freq_table
-
-MODEL_NAME=`grep '^model name' "$CPUINFO" | head -n 1 | sed -e 's/^.*: //;'`
-CPU=`grep -E '^cpud[^:]+:' "$CPUINFO" | head -n 1 | sed -e 's/^.*: //;'`
-VENDOR_ID=`grep -E '^vendor_id[^:]+:' "$CPUINFO" | head -n 1 | sed -e 's/^.*: //;'`
-CPU_FAMILY=$(sed -e '/^cpu family/ {s/.*: //;p;Q};d' $CPUINFO)
-
-MODULE=none
-MODULE_FALLBACK=acpi-cpufreq
-
-# Two modules for PIII-M depending the chipset.
-# modprobe speedstep-ich$EXT || modprobe speestep-smi$EXT  would be another way
-if [ -f $IOPORTS ] && grep -q 'Intel .*ICH' $IOPORTS ; then
-  PIII_MODULE=speedstep-ich
-else
-  PIII_MODULE=speedstep-smi
-fi
-
-case "$VENDOR_ID" in
-    GenuineIntel*)
-    # If the CPU has the est flag, it supports enhanced speedstep and should
-    # use the speedstep-centrino driver
-    if [ "$(grep est $CPUINFO)" ]; then
-        case "$(uname -r)" in
-            2.6.2[0-9]*)
-                # Prefer acpi-cpufreq for kernels after 2.6.20
-                MODULE=acpi-cpufreq
-                ;;
-            *)
-                MODULE=speedstep-centrino
-                ;;
-        esac
-    elif [ $CPU_FAMILY = 15 ]; then
-    # Right. Check if it's a P4 without est.
-        # Could be speedstep-ich, or could be p4-clockmod.
-        MODULE=speedstep-ich;
-        # Disabled for now - the latency tends to be bad enough to make it
-        # fairly pointless.
-        # echo "FREQDRIVER=p4-clockmod" >/etc/default/powernowd
-        # to override this
-        #if [ $LAPTOP = "1" ]; then
-        #    MODULE_FALLBACK=p4-clockmod;
-        #fi
-    else
-    # So it doesn't have Enhanced Speedstep, and it's not a P4. It could be
-    # a Speedstep PIII, or it may be unsupported. There's no terribly good
-    # programmatic way of telling.
-        case "$MODEL_NAME" in
-            Intel\(R\)\ Pentium\(R\)\ III\ Mobile\ CPU*)
-            MODULE=$PIII_MODULE ;;
-
-        # JD: says this works with   cpufreq_userspace
-            Mobile\ Intel\(R\)\ Pentium\(R\)\ III\ CPU\ -\ M*)
-            MODULE=$PIII_MODULE ;;
-
-        # https://bugzilla.ubuntu.com/show_bug.cgi?id=4262
-        # UNCONFIRMED
-            Pentium\ III\ \(Coppermine\)*)
-            MODULE=$PIII_MODULE ;;
-
-            Intel\(R\)\ Celeron\(R\)\ M\ processor*)
-            MODULE=p4-clockmod ;;
-
-        esac
-    fi
-    ;;
-    AuthenticAMD*)
-    # Hurrah. This is nice and easy.
-    case $CPU_FAMILY in
-        5)
-        # K6
-        MODULE=powernow-k6
-        ;;
-        6)
-        # K7
-        MODULE=powernow-k7
-        ;;
-        15|16|20)
-        # K8 (=15), Phenom (=16), AMD E-350 all-in-one CPUs (=20)
-        MODULE=powernow-k8
-        ;;
-    esac
-    ;;
-    CentaurHauls*)
-    # VIA
-    if [ $CPU_FAMILY = 6 ]; then
-        MODULE=longhaul;
-    fi
-    ;;
-    GenuineTMx86*)
-    # Transmeta
-    if [ "`grep longrun $CPUINFO`" ]; then
-        MODULE=longrun
-    fi
-    ;;
-esac
-
-## END OF FILE #################################################################