Fixed connection tracking bug (also in Core 27).

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

diff --git a/make.sh b/make.sh
index 1bc721405bb49d8ccf00801f3e7e0ac51b61efaf..de92e58a2987ca00404b6f40c588616e4e102b08 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-test"
+VERSION="2.3"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -306,7 +306,7 @@ buildbase() {
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
-    lfsmake2 modutils
+    lfsmake2 module-init-tools
     lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
@@ -334,6 +334,7 @@ buildipfire() {
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake rp-pppoe
+  ipfiremake pptp
   ipfiremake unzip
   ipfiremake linux
   ipfiremake atl2
@@ -405,7 +406,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
   ipfiremake iputils
@@ -581,6 +581,16 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
+  ipfiremake cryptsetup
+  ipfiremake splix
+  ipfiremake streamripper
+  ipfiremake sshfs
+  ipfiremake libdlna
+  ipfiremake ushare
+  ipfiremake sqlite
+  ipfiremake taglib
+  ipfiremake mediatomb
+  ipfiremake sslh
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -657,15 +667,15 @@ buildpackages() {
   $0 git log
 
   # Create images for install
-       ipfiremake cdrom ED=full
+       ipfiremake cdrom ED=$IPFVER
        
   # Check if there is a loop device for building in virtual environments
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-       ipfiremake usb-stick
+       ipfiremake usb-stick ED=$IPFVER
   fi
 
   # Create updater package
-  ipfiremake updater
+  #ipfiremake updater
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
@@ -857,7 +867,7 @@ gettoolchain)
                test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
                echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
                cd $BASEDIR/cache/toolchains
-               wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
+               wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
                if [ $? -ne 0 ]; then
                        echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
                else