Geaendert:

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 143c0611e3cd1873a7ff6ba79a2bba1495d3e9b4..e2cf36b9b9cfe21a084798a86b642d1137ed278e 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -344,7 +344,7 @@ ipcopmake() {
 
 ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-#         if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
+#         if [ ! `ls -w1 $BASEDIR/packages/*.ipfire | grep $1` ]; then
                echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
                chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
@@ -733,7 +733,7 @@ buildipcop() {
   ipcopmake asterisk
   ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### Multimedia-Server ### \n" | tee -a $LOGFILE
-  ipcopamke libmad
+  ipcopmake libmad
   ipcopmake libogg
   ipcopmake libvorbis
   ipcopmake lame
@@ -866,8 +866,8 @@ buildpackages() {
                cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
        fi
   done
-  cd $BASEDIR/packages; ls -w1 *.tar.gz | awk -F ".tar.gz" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
-  echo "###EOF###" >> $BASEDIR/packages/packages_list.txt
+  cd $BASEDIR/packages; ls -w1 *.ipfire | awk -F ".ipfire" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
+  echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
 
@@ -916,7 +916,7 @@ ipfirepackages() {
 #  ipfiredist xinetd
   ipfiredist xvid
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
 }
 
@@ -1191,6 +1191,7 @@ svn)
                        exit 1
                fi
                chmod 755 $0
+               tail log/_build.svn.update.log
                exit 0
          ;;
          commit|ci)