X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=d5ec02c5a3c66a8906f769637eda1b9f35e1f0a1;hb=b0fdaa6f34b1529951f7aeb5c13d26c10fbd750d;hp=9aa1aca80db2c4ce5ecb6747379a5d955914a42f;hpb=bfc35ba280e0beb8b7129049ef14e18c2d32588d;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 9aa1aca80d..d5ec02c5a3 100755
--- 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="37"						# 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
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
-TOOLCHAINVER=2
+TOOLCHAINVER=3
 IPFVER="full"				# Which versions should be compiled? (full|devel)
 
 # Debian specific settings
@@ -231,7 +231,7 @@ buildtoolchain() {
     ORG_PATH=$PATH
     NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
     export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
-    lfsmake1 ccache
+    lfsmake1 ccache	PASS=1
     lfsmake1 binutils	PASS=1
     lfsmake1 gcc		PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@ -243,6 +243,7 @@ buildtoolchain() {
     lfsmake1 dejagnu
     lfsmake1 gcc		PASS=2
     lfsmake1 binutils	PASS=2
+    lfsmake1 ccache	PASS=2
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
@@ -337,7 +338,6 @@ buildipfire() {
   ipfiremake libusb
   ipfiremake libpcap
   ipfiremake ppp
-  ipfiremake rp-pppoe
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
@@ -345,26 +345,34 @@ buildipfire() {
   ipfiremake linux-firmware
   ipfiremake linux			XEN=1
   ipfiremake kqemu			XEN=1
-  #ipfiremake kvm-kmod			XEN=1
   ipfiremake v4l-dvb			XEN=1
   ipfiremake madwifi			XEN=1
-  #ipfiremake alsa			XEN=1 KMOD=1
+  ipfiremake mISDN			XEN=1
   ipfiremake dahdi			XEN=1 KMOD=1
-  #ipfiremake openswan			XEN=1 KMOD=1
-  #ipfiremake mISDN			XEN=1
-  #ipfiremake compat-wireless		XEN=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 openswan			KMOD=1
-  #ipfiremake mISDN
-  #ipfiremake compat-wireless
   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
@@ -539,6 +547,7 @@ buildipfire() {
   ipfiremake ipfireseeder
   ipfiremake rsync
   ipfiremake tcpwrapper
+  ipfiremake libevent
   ipfiremake portmap
   ipfiremake nfs
   ipfiremake nmap
@@ -548,7 +557,6 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-#  ipfiremake openswan
   ipfiremake strongswan
   ipfiremake lsof
   ipfiremake centerim
@@ -558,7 +566,6 @@ buildipfire() {
   ipfiremake liboping
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
@@ -589,7 +596,6 @@ buildipfire() {
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
-  ipfiremake esniper
   ipfiremake vnstat
   ipfiremake vnstati
   ipfiremake iw
@@ -607,7 +613,6 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  #ipfiremake cryptsetup
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
@@ -617,15 +622,13 @@ buildipfire() {
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
-#  ipfiremake x11libs
-#  ipfiremake xen
   ipfiremake miau
   ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  ipfiremake open-vm-tools
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
@@ -641,6 +644,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
@@ -680,8 +686,6 @@ buildinstaller() {
   installmake popt
   installmake sysvinit
   installmake misc-progs
-  installmake libaal
-  installmake reiser4progs
   installmake reiserfsprogs
   installmake sysfsutils
   installmake util-linux
@@ -1017,11 +1021,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