Fix bandwich usage display with IE8.

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

diff --git a/make.sh b/make.sh
index f455bd01f7f294a3e37ccce950c4747ab03a1478..166f9ecab485b9dd426f28fc375d7090fea4733a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.6"                                                  # Version number
-CORE="38"                                                      # Core Level (Filename)
-PAKFIRE_CORE="38"                                              # Core Level (PAKFIRE)
+VERSION="2.7"                                                  # Version number
+CORE="41"                                                      # Core Level (Filename)
+PAKFIRE_CORE="40"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -337,7 +337,6 @@ buildipfire() {
   ipfiremake libusb
   ipfiremake libpcap
   ipfiremake ppp
-  ipfiremake rp-pppoe
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
@@ -347,16 +346,32 @@ buildipfire() {
   ipfiremake kqemu                     XEN=1
   ipfiremake v4l-dvb                   XEN=1
   ipfiremake madwifi                   XEN=1
+  ipfiremake mISDN                     XEN=1
   ipfiremake dahdi                     XEN=1 KMOD=1
   ipfiremake cryptodev                 XEN=1
+  ipfiremake compat-wireless           XEN=1
+  ipfiremake r8169                     XEN=1
+  ipfiremake r8168                     XEN=1
+  ipfiremake r8101                     XEN=1
+  ipfiremake e1000                     XEN=1
+  ipfiremake e1000e                    XEN=1
+  ipfiremake igb                       XEN=1
   ipfiremake linux
   ipfiremake kqemu
   ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa                      KMOD=1
+  ipfiremake mISDN
   ipfiremake dahdi                     KMOD=1
   ipfiremake cryptodev
+  ipfiremake compat-wireless
+  ipfiremake r8169
+  ipfiremake r8168
+  ipfiremake r8101
+  ipfiremake e1000
+  ipfiremake e1000e
+  ipfiremake igb
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -531,6 +546,7 @@ buildipfire() {
   ipfiremake ipfireseeder
   ipfiremake rsync
   ipfiremake tcpwrapper
+  ipfiremake libevent
   ipfiremake portmap
   ipfiremake nfs
   ipfiremake nmap
@@ -611,7 +627,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  ipfiremake open-vm-tools
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
@@ -627,6 +643,9 @@ buildipfire() {
   ipfiremake mdadm
   ipfiremake eject
   ipfiremake pound
+  ipfiremake minicom
+  ipfiremake ddrescue
+  ipfiremake imspector
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -666,8 +685,6 @@ buildinstaller() {
   installmake popt
   installmake sysvinit
   installmake misc-progs
-  installmake libaal
-  installmake reiser4progs
   installmake reiserfsprogs
   installmake sysfsutils
   installmake util-linux
@@ -1003,11 +1020,12 @@ uploadsrc)
                beautify message FAIL
                exit 1
        fi
+
        URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-       REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+       REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
 
        cd $BASEDIR/cache/
-       for file in $(ls -1); do
+       for file in $(ls -1 --ignore=toolchains); do
                grep -q "$file" <<<$REMOTE_FILES && continue
                NEW_FILES="$NEW_FILES $file"
        done