From 2175773794fd0fd3122c59d12ac07b6186253abf Mon Sep 17 00:00:00 2001
From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Mon, 5 Jun 2006 11:51:06 +0000
Subject: [PATCH] =?utf8?q?Ge=C3=A4ndert:=20=20=20*=20HDDTemp=20wieder=20ak?=
 =?utf8?q?tiviert.=20Bisher=20nur=20das=20Binary.=20CGI=20folgt=20sp=C3=A4?=
 =?utf8?q?ter.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@161 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 doc/packages-list.txt |  1 +
 lfs/hddtemp           | 13 +++++--------
 make.sh               | 25 ++++++++++++-------------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 4e2ef3d725..85e547b0d0 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -99,6 +99,7 @@
   * groff-1.19
   * grub-0.95
   * gzip-1.3.5
+  * hddtemp-0.3-beta14
   * hdparm-6.3
   * htop-0.6.2
   * iana-etc-2.00
diff --git a/lfs/hddtemp b/lfs/hddtemp
index a9dcdbfa75..930202cd18 100644
--- a/lfs/hddtemp
+++ b/lfs/hddtemp
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -44,11 +38,14 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+		hddtemp.db
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+hddtemp.db = $(DL_FROM)/hddtemp.db
 
 $(DL_FILE)_MD5 = bbf8be4539495e18bec54af77511a680
+hddtemp.db_MD5 = 5321858f8c028d4b1a91a8a5f951f2f8
 
 install : $(TARGET)
 
@@ -81,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-#	cd $(DIR_APP) && wget http://www.guzu.net/linux/hddtemp.db && cp hddtemp.db /etc/hddtemp.db
+	cd $(DIR_APP) && cp -fv $(DIR_DL)/hddtemp.db /etc/hddtemp.db
 	cd $(DIR_APP) && ./configure --with-db-path=/etc/hddtemp.db
 	cd $(DIR_APP) && make && make install
 	@rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index d71418f5e8..cc7a80fa97 100644
--- a/make.sh
+++ b/make.sh
@@ -722,8 +722,7 @@ buildipcop() {
   ipcopmake ncftp
   ipcopmake cftp
   ipcopmake ethereal
-#  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
-#  ipcopmake hddtemp
+  ipcopmake hddtemp
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
@@ -857,7 +856,7 @@ ipfirepackages() {
 case "$1" in 
 build)
 	BUILDMACHINE=`uname -m`
-	PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-1.4.*-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
+	PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-1.4-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
 	#only restore on a clean disk
 	if [ ! -f log/perl-*-tools ]; then
 		if [ ! -n "$PACKAGE" ]; then
@@ -1070,18 +1069,18 @@ gettoolchain)
 	URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
 	echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
 	cd $BASEDIR/cache
-	wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
+	wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null
 	if [ $? -ne 0 ]; then
 		echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
-	else
-		if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
-			echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
-			echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
-			cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
-			rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
-		else
-			exiterror "$PACKAGE.md5 did not match, check downloaded package"
-		fi
+#	else
+#		if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
+#			echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
+#			echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
+#			cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
+#			rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
+#		else
+#			exiterror "$PACKAGE.md5 did not match, check downloaded package"
+#		fi
 	fi
 	;;
 paks)
-- 
2.39.2