Geändert:

  * HDDTemp wieder aktiviert. Bisher nur das Binary. CGI folgt später.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@161 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 4e2ef3d72575274bd2e192bbe523de01cf972a3a..85e547b0d078ea09fa65484d47968d2ebad66be4 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -99,6 +99,7 @@
   * groff-1.19
   * grub-0.95
   * gzip-1.3.5
   * 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
   * hdparm-6.3
   * htop-0.6.2
   * iana-etc-2.00

diff --git a/lfs/hddtemp b/lfs/hddtemp
index a9dcdbfa75b4555dbff422b15eb6f9c106eafc69..930202cd18bfb281349a7b7c218fce415544848c 100644 (file)
--- 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>                        #
 #                                                                             #
 # 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
 ###############################################################################
 
 # Top-level Rules
 ###############################################################################
 

-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+               hddtemp.db

 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

+hddtemp.db = $(DL_FROM)/hddtemp.db

 
 $(DL_FILE)_MD5 = bbf8be4539495e18bec54af77511a680
 
 $(DL_FILE)_MD5 = bbf8be4539495e18bec54af77511a680

+hddtemp.db_MD5 = 5321858f8c028d4b1a91a8a5f951f2f8

 
 install : $(TARGET)
 
 
 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)
 $(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)
        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 d71418f5e8d43f7a493262ae39e18056e60e1e53..cc7a80fa97e74f641d643561e895dc3f0351336e 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -722,8 +722,7 @@ buildipcop() {
   ipcopmake ncftp
   ipcopmake cftp
   ipcopmake ethereal
   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
 }
 
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 


@@ -857,7 +856,7 @@ ipfirepackages() {
 case "$1" in 
 build)
        BUILDMACHINE=`uname -m`
 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
        #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
        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
        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)
        fi
        ;;
 paks)