Geändert:

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

diff --git a/make.sh b/make.sh
index 834c942d86062b4ca650bcd5c28914976f35b481..31c5a4cc72635fe2c51ea1411d654bbf12bd1a79 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -647,27 +647,37 @@ buildipcop() {
   ipcopmake libsafe
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
+## Zuerst die Libs und dann die Programme. Ordnung muss sein!
+  ipcopmake berkeley-DB
+  ipcopmake libtiff
+  ipcopmake libxml2
+  ipcopmake spandsp
+  ipcopmake lzo
   ipcopmake pkg-config
   ipcopmake glib
-  ipcopmake wget
-  ipcopmake berkeley-DB
   ipcopmake xampp
-  ipcopmake bridge-utils
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake sudo
+  ipcopmake mc
+  ipcopmake pwlib
+  ipcopmake openh323
+  ipcopmake xinetd
+  ipcopmake wget
+  ipcopmake bridge-utils
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
   ipcopmake saslauthd PASS=2
-#  ipcopmake samba
-  ipcopmake mc
+  ipcopmake samba
   ipcopmake postfix
   ipcopmake stund
   ipcopmake lpd
-  ipcopmake pwlib
-  ipcopmake openh323
+  ipcopmake openvpn
+  ipcopmake asterisk
+  ipcopmake edonkeyclc
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp
-
+# ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
 buildinstaller() {
@@ -750,15 +760,20 @@ buildpackages() {
   grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|setup$\|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 IPCopSoftwares
+  # packages-list.txt is ready to be displayed for wiki page
 
   # Create ISO for CDRom and USB-superfloppy
   ipcopmake cdrom
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
-  
+
   # Build IPFire packages
-  ipfiredist postfix
+  ipfiredist libtiff
+  ipfiredist libxml2
   ipfiredist mc
+  ipfiredist postfix
+  ipfiredist spandsp
+  ipfiredist sudo
+  ipfiredist xinetd
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -927,20 +942,19 @@ dist)
        fi
        ;;
 newpak)
-       # create structure for $VERSION update
-       echo -e "What is the name of the new package?"
-       read $NAME
-       if [ ! -f "lfs/$NAME" ]; then
-               echo "`date -u '+%b %e %T'`: Creating directory src/paks/$NAME"
-               mkdir -p src/paks/$NAME
-               cd src/paks/$NAME
+       # create structure for a new package
+       echo -e "Name of the new package: $2"
+       if [ ! -f "lfs/$2" ]; then
+               echo "`date -u '+%b %e %T'`: Creating directory src/paks/$2"
+               mkdir -p src/paks/$2
+               cd src/paks/$2
                echo "`date -u '+%b %e %T'`: Creating files"
-               cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$NAME
+               cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
+
                touch ROOTFILES
                touch CONFFILES
                touch {,un}install.sh
-
-## install.sh
+       ## install.sh
                echo '#!/bin/bash' > install.sh
                echo '#' >> install.sh
                echo '#################################################################' >> install.sh
@@ -951,9 +965,8 @@ newpak)
                echo '#' >> install.sh
                echo '# Extract the files' >> install.sh
                echo 'tar xfz files.tgz -C /' >> install.sh
-               echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$NAME' >> install.sh
-
-## uninstall.sh
+               echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2' >> install.sh
+       ## uninstall.sh
                echo '#!/bin/bash' > uninstall.sh
                echo '#################################################################' >> uninstall.sh
                echo '#                                                               #' >> uninstall.sh
@@ -963,12 +976,20 @@ newpak)
                echo '#' >> uninstall.sh
                echo '# Delete the files' >> uninstall.sh
                echo '## Befehl fehlt noch' >> uninstall.sh
-               echo 'rm -f /opt/pakfire/installed/ROOTFILES.$NAME' >> uninstall.sh
-
+               echo 'rm -f /opt/pakfire/installed/ROOTFILES.$2' >> uninstall.sh
                echo "`date -u '+%b %e %T'`: Adding files to SVN"
-               cd - && svn add src/paks/$NAME
+               cd - && svn add lfs/$2 && svn add src/paks/$2
+
+               echo -n "Do you want to remove the folders? [y/n]"
+               read REM
+               if  [ "$REM" == "y" ]; then
+                       echo "Removing the folders..."
+                       svn del src/paks/$2 --force
+               else
+                       echo "Folders are kept."
+               fi
        else
-               echo "$NAME already exists"
+               echo "$2 already exists"
        fi
        exit 0
        ;;
@@ -1083,8 +1104,12 @@ gettoolchain)
                fi
        fi
        ;;
+update)
+       echo "Load the latest source-files:"
+       svn update
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newupdate|prefetch|rootfiles|shell|toolchain}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newpak|prefetch|rootfiles|shell|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;