From 6208ec9870659be04be64da33d020e4470a77ce7 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 14 Feb 2015 07:40:16 +0000
Subject: Delete powertop.trisquel6 (keep powertop.trisquel7)

Trisquel 6 is obsolete. Everyone should upgrade to Trisquel 7.
---
 docs/misc/index.html    | 31 ++++----------------
 powertop.trisquel6      | 77 -------------------------------------------------
 powertop.trisquel6.init | 23 ---------------
 3 files changed, 6 insertions(+), 125 deletions(-)
 delete mode 100755 powertop.trisquel6
 delete mode 100755 powertop.trisquel6.init

diff --git a/docs/misc/index.html b/docs/misc/index.html
index a4e0abab..3bda2e71 100644
--- a/docs/misc/index.html
+++ b/docs/misc/index.html
@@ -19,12 +19,7 @@
 				Or <a href="../index.html">Back to main index</a>.
 			</p>
 			<ul>
-				<li><a href="#high_pitch_trisquel">High Pitched Whining Noise on Idle (how to remove in Trisquel)</a>
-					<ul>
-						<li><a href="#howtouse_powertop">Powertop - how to use</a></li>
-						<li><a href="#powertop_autostart">Powertop - Start automatically at boot time</a></li>
-					</ul>
-				</li>
+				<li><a href="#trisquel7_powertop">High Pitched Whining Noise on Idle (how to remove in Trisquel 7)</a></li>
 				<li><a href="#high_pitch_parabola">High Pitched Whining Noise on Idle (how to remove in Parabola)</a></li>
 				<li><a href="#serial">X60/T60: Serial port - how to use (for dock owners)</a></li>
 				<li><a href="patch.html">Using diff and patch</a></li>
@@ -34,33 +29,19 @@
 
 	<div class="section">
 
-		<h1 id="high_pitch_trisquel">High Pitched Whining Noise on Idle (how to remove in Trisquel)</h1>
+		<h1 id="trisquel7_powertop">High Pitched Whining Noise on Idle (how to remove in Trisquel)</h1>
 
 			<p>
-				Tested in Trisquel 6 and 7.
+				Tested in Trisquel 7.
 			</p>
 
 			<div class="subsection">
-				<h2 id="howtouse_powertop">Powertop - how to use</h2>
+				<h2 id="trisquel7_powertop_autostart">Powertop - Start automatically at boot time (Trisquel 7)</h2>
 
-					<p>Now you can use this command to kill that noise:<br/>
-					<b>$ sudo powertop --auto-tune</b></p>
-
-					<p>You can also run it without parameters and then go into 'Tunables' and set everything to 'Good'</p>
-
-					<p>Note: On Trisquel 6, you will need to use a later powertop version from git. The one in the repositories is too old. See below:</p>
-			</div>
-
-			<div class="subsection">
-				<h2 id="powertop_autostart">Powertop - Start automatically at boot time (Trisquel 6)</h2>
-
-					<p>Included with libreboot is a script called 'powertop.trisquel6'. Run this and it will setup powertop to run with --auto-tune 
+					<p>Included with libreboot is a script called 'powertop.trisquel7'. Run this as root and it will setup powertop to run with --auto-tune 
 					at boot time. Load the file in your text editor to see how it does that.</p>
 
-					<p><b>$ ./powertop.trisquel6</b></p>
-
-					<p>For Trisquel 7 users:</p>
-					<p><b>$ ./powertop.trisquel7</b></p>
+					<p>$ <b>sudo ./powertop.trisquel7</b></p>
 			</div>
 
 			<p><a href="#pagetop">Back to top of page</a></p>
diff --git a/powertop.trisquel6 b/powertop.trisquel6
deleted file mode 100755
index 6388385c..00000000
--- a/powertop.trisquel6
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-#  powertop.trisquel6: automatically sets up powertop --auto-tune on startup in trisquel 6
-#
-#	Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set -u -e -v
-
-if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 
-   exit 1
-fi
-
-# For Trisquel 6.0 (and 6.0.1) users.
-
-# powertop on Trisquel 6 is out of date. We will get it from git.
-# We are using a specific git revision (one that I have tested)
-
-# Delete the one that is already installed from repo's (if it is installed)
-apt-get -y purge powertop
-
-# Install dependencies:
-apt-get -y install libpci-dev libncurses-dev libnl-dev build-essential git autoconf2.13 libtool autotools-dev autopoint pkg-config
-
-# remove previous git clone if it exists:
-rm -rf powertop
-
-# Download from git
-git clone https://github.com/fenrus75/powertop.git
-
-cd powertop/
-
-# Revert to specific commit (from when powertop was last tested):
-git reset --hard e70c89eb5d7b6b8f898bb126adefcbf3202d5acf
-
-# build it
-./autogen.sh
-./configure
-make
-
-# install it
-make install
-
-# Remove startup symlink if it exists
-update-rc.d powertop remove
-# Remove previous file if it exists
-rm  -rf /etc/init.d/powertop
-
-# write the correct commands there:
-cp ../powertop.trisquel6.init /etc/init.d/powertop
-
-# make it executable:
-chmod +x /etc/init.d/powertop
-
-# Add the service to make it run automatically at boot time:
-update-rc.d powertop defaults
-
-# Run powertop now and tell the user
-powertop --auto-tune
-echo "Done. Run 'powertop --auto-tune' now. This will also run automatically at boot time. Run it again at any time, if needed. This has also been done for you just now."
-
-# Come out of powertop directory (we are done)
-cd ../
diff --git a/powertop.trisquel6.init b/powertop.trisquel6.init
deleted file mode 100755
index 50d35b5f..00000000
--- a/powertop.trisquel6.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-#  powertop.trisquel6.init: the powertop.trisquel6 setup script puts this script in /etc/init.d in Trisquel 6
-#
-#	Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-/usr/local/sbin/powertop --auto-tune
-echo 'auto' > '/sys/bus/usb/devices/4-2/power/control';
-echo 'auto' > '/sys/bus/usb/devices/4-1/power/control';
-- 
cgit v1.2.3-70-g09d2