Removed directfb from deps of videolan and sdl

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

diff --git a/make.sh b/make.sh
index b2cdaea0d2cda2065ac87e6b3d717cf8d52ec51c..13002c6a1df98be7dbedcf94ce76098e1019b8e8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -22,13 +22,13 @@
 ############################################################################
 #
 
-NAME="IPFire"                                                                          # Software name
-SNAME="ipfire"                                                                 # Short name
-VERSION="2.1"                                                                          # Version number
-SLOGAN="www.ipfire.org"                                        # Software slogan
-CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
-NICE=10                                                                                                        # Nice level
-MAX_RETRIES=1                                                                          # prefetch/check loop
+NAME="IPFire"                          # Software name
+SNAME="ipfire"                         # Short name
+VERSION="2.1"                          # Version number
+SLOGAN="www.ipfire.org"                        # Software slogan
+CONFIG_ROOT=/var/ipfire                        # Configuration rootdir
+NICE=10                                        # Nice level
+MAX_RETRIES=1                          # prefetch/check loop
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 
@@ -351,6 +351,7 @@ buildipfire() {
   ipfiremake dm9601
   ipfiremake kqemu
   ipfiremake sane              KMOD=1
+  ipfiremake madwifi
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -517,7 +518,7 @@ buildipfire() {
   ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
-  ipfiremake videolan
+  ipfiremake cmake
   ipfiremake libpri
   ipfiremake asterisk
   ipfiremake gnump3d
@@ -564,8 +565,15 @@ buildipfire() {
   ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
+  ipfiremake ffmpeg
+  ipfiremake videolan
   ipfiremake vdr
+  ipfiremake w_scan
   ipfiremake git
+  ipfiremake squidclamav
+  ipfiremake bc
+  ipfiremake wpa_supplicant
+  ipfiremake hostapd
 }
 
 buildinstaller() {
@@ -711,13 +719,6 @@ build)
        beautify build_stage "Building IPFire"
        buildipfire
 
-       # Setzen des IPFire Builds
-       if [ "$SVN_REVISION" ]; then
-               echo "$SVN_REVISION" > $BASEDIR/build/var/ipfire/firebuild
-       else
-               echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
-       fi
-
        beautify build_stage "Building installer"
        buildinstaller
 
@@ -731,11 +732,6 @@ shell)
        prepareenv
        entershell
        ;;
-changelog)
-       echo -n "Loading new Changelog from SVN: "
-       svn log http://svn.ipfire.org/svn/ipfire > doc/ChangeLog
-       beautify message DONE
-       ;;
 clean)
        echo -en "${BOLD}Cleaning build directory...${NORMAL}"
        for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do
@@ -1014,8 +1010,7 @@ lang)
        ;;
 "")
        clear
-       svn info
-       select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help"
+       select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "LOG: Tail" "Help"
        do
        case $name in
        "IPFIRE: Downloadsrc")
@@ -1033,9 +1028,6 @@ lang)
        "IPFIRE: Clean")
                $0 clean
                ;;
-       "SVN: Update")
-               $0 svn update
-               ;;
        "Help")
                echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}"
                cat doc/make.sh-usage