Hinzugefügt:

  * ./make.sh pub lädt die ISO auf den mirror.ipfire.org
Geändert:
  * ./make.sh paks verändert. Pakete werden nur noch gebaut, wenn sie noch nicht da sind.
  Zum neu bauen einfach das File löschen und beim nächsten durchlauf wird es wieder mitgebaut.

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 4fd797527a3f6fc0ba2fa1aa0cb01108df637f6e..31fbaacc0241e5072a37cf1dd890d432b6624a88 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -162,7 +162,6 @@
   * openssl-0.9.7i
   * openswan-1.0.10
   * openvpn-2.0.7
-  * pakfire
   * pam_mysql-0.7RC1
   * patch-2.5.4
   * pciutils-2.1.11

diff --git a/doc/packages-to-remove-from-ftp b/doc/packages-to-remove-from-ftp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..171a3c78d5a13535ae83f50b49adcc40996115a9 100644 (file)
--- a/doc/packages-to-remove-from-ftp
+++ b/doc/packages-to-remove-from-ftp
@@ -0,0 +1,2 @@
+xampp-linux-1.5.1.tar.gz
+xampp-linux-devel-1.5.1.tar.gz

diff --git a/lfs/libtiff b/lfs/libtiff
index 658d6a2f474b8165e55e17276bb147ecc97bbc02..df9bb1111df0e6eb105eb23b514c3b8407500163 100644 (file)
--- a/lfs/libtiff
+++ b/lfs/libtiff
@@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh libtiff $(THISAPP)-ipfire-beta-1
+       make-packages.sh libtiff lib$(THISAPP)-ipfire-beta-1
 
 ###############################################################################
 # Downloading, checking, md5sum

diff --git a/make.sh b/make.sh
index 803baeee5e9b77de4dc04e7e1c8e798e122f2fb3..2b94e94de656f64f4c0001d87a34f658dafbc480 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -335,7 +335,8 @@ ipcopmake() {
 
 ipfiredist() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-         if [ "`ls -w1 $BASEDIR/packages/ | grep $1; echo $?`" -ne "0" ]; then
+         ls $BASEDIR/packages/$1* >& /dev/null
+         if [ $? -eq 1 ]; then
                echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
                cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
                chroot $LFS /tools/bin/env -i   HOME=/root \
@@ -354,8 +355,8 @@ ipfiredist() {
                        exiterror "Packaging $1"
                fi
          else
-               echo "`date -u '+%b %e %T'`: Package $1 already exists" | tee -a $LOGFILE
-         fi            
+               echo -e "`date -u '+%b %e %T'`: Packages with name $1 already exists!" | tee -a $LOGFILE
+         fi
        else
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
        fi
@@ -783,13 +784,6 @@ buildpackages() {
        rm -f $LFS/license.txt >> $LOGFILE 2>&1
        cd $BASEDIR
   fi
-
-#  Create update for this version
-#  echo "`date -u '+%b %e %T'`: Building update $VERSION tgz" | tee -a $LOGFILE
-#  tar -cz -C $BASEDIR/build --files-from=$BASEDIR/updates/$VERSION/ROOTFILES.$MACHINE-$VERSION -f $BASEDIR/updates/$VERSION/patch.tar.gz --exclude='#*'; 
-#  chmod 755 $BASEDIR/updates/$VERSION/setup
-#  tar -cz -C $BASEDIR/updates/$VERSION -f $LFS/install/images/$SNAME-update-$VERSION.$MACHINE.tgz patch.tar.gz setup information
-#  rm -f $LFS/var/run/{need-depmod-$KVER,need-depmod-$KVER-smp}
   
   # Generating list of packages used
   echo "`date -u '+%b %e %T'`: Generating packages list from logs" | tee -a $LOGFILE
@@ -800,15 +794,39 @@ buildpackages() {
        fi
   done
   echo "====== List of softwares used to build $NAME Version: $VERSION ======" > $BASEDIR/doc/packages-list.txt
-  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|setup$\|stage2$\|smp$\|tools$\|tools1$\|tools2$' \
+  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$' \
        $BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
 
   # Create ISO for CDRom and USB-superfloppy
   ipcopmake cdrom
+  rm -f $LFS/install/images/*usb*
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
+  ipfirepackages
+
+  # Cleanup
+  stdumount
+  rm -rf $BASEDIR/build/tmp/*
+
+  # Generating total list of files
+  echo "`date -u '+%b %e %T'`: Generating files list from logs" | tee -a $LOGFILE
+  rm -f $BASEDIR/log/FILES
+  for i in `ls -1tr $BASEDIR/log/[^_]*`; do
+       if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
+               echo "##" >>$BASEDIR/log/FILES
+               echo "## `basename $i`" >>$BASEDIR/log/FILES
+               echo "##" >>$BASEDIR/log/FILES
+               cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
+       fi
+  done
+
+  cd $PWD
+
+}
+
+ipfirepackages() {
   ipfiredist applejuice
   ipfiredist asterisk
   ipfiredist cyrusimap
@@ -829,25 +847,6 @@ buildpackages() {
   mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf $LFS/paks
   rm -rf $BASEDIR/build/tmp/*
-
-  # Cleanup
-  stdumount
-  rm -rf $BASEDIR/build/tmp/*
-
-  # Generating total list of files
-  echo "`date -u '+%b %e %T'`: Generating files list from logs" | tee -a $LOGFILE
-  rm -f $BASEDIR/log/FILES
-  for i in `ls -1tr $BASEDIR/log/[^_]*`; do
-       if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
-               echo "##" >>$BASEDIR/log/FILES
-               echo "## `basename $i`" >>$BASEDIR/log/FILES
-               echo "##" >>$BASEDIR/log/FILES
-               cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
-       fi
-  done
-
-  cd $PWD
-
 }
 
 # See what we're supposed to do
@@ -1084,6 +1083,7 @@ gettoolchain)
 paks)
        prepareenv
        buildpackages
+       # ipfirepackages
        ;;
 update)
        echo "Load the latest source-files:"
@@ -1092,6 +1092,7 @@ update)
 commit)
        echo "Upload the changed files:"
        svn commit
+       svn up > /dev/null
        ;;
 make)
        echo "Do a complete compile:"   
@@ -1127,8 +1128,28 @@ sync)
        done
        rm -f ftplist
        ;;
+pub)
+       echo -e "Upload the ISO to the beta-mirror!"
+       echo -ne "Password for mirror.ipfire.org: "; read PASS
+
+       ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/beta/ | grep `svn info | grep Revision | cut -c 11-`
+       if [ "$?" -eq "1" ]; then
+                       cp $BASEDIR/ipfire-install-1.4.i386.iso $BASEDIR/ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso
+                       md5sum ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso > ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso.md5
+                       ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/beta/ ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso
+                       ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/beta/ ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso.md5
+                       if [ "$?" -eq "0" ]; then
+                               echo -e "The ISO of Revision `svn info | grep Revision | cut -c 11-` was successfully uploaded to the ftp server."
+                       else
+                               echo -e "There was an error while uploading the ISO to the ftp server."
+                       fi
+       else
+               echo -e "File with name ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso already exists on the ftp server!"
+       fi
+       rm -f ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso{,.md5}
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|sync|toolchain|update}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|pub|shell|sync|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;