X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=9817aaba7d930664c7789b44e1c45f1f877eae7e;hp=cc2d3c500799143e2df5ba28de2a8ebf759f3304;hb=a56df4eede029cb13aa66eb0d9aa35dd45e2a5f7;hpb=e0bbaf87779eaf0d53d96bf4bc2efd91a9fde28b

diff --git a/make.sh b/make.sh
index cc2d3c5007..9817aaba7d 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.8test"						# Version number
-CORE="41"							# Core Level (Filename)
-PAKFIRE_CORE="40"						# Core Level (PAKFIRE)
+VERSION="2.9beta2"						# Version number
+CORE="43"							# Core Level (Filename)
+PAKFIRE_CORE="43"						# 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,9 +37,16 @@ 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=1
 IPFVER="full"				# Which versions should be compiled? (full|devel)
 
+BUILDMACHINE=$MACHINE
+    if [ "$MACHINE" = "x86_64" ]; then
+        BUILDMACHINE="i686";
+        linux32="linux32";
+    fi
+
+
 # Debian specific settings
 if [ ! -e /etc/debian_version ]; then
 	FULLPATH=`which $0`
@@ -219,6 +226,7 @@ prepareenv() {
 
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
+    export CCACHE_COMPRESS=1
     export CCACHE_HASHDIR=1
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
@@ -226,12 +234,19 @@ prepareenv() {
 }
 
 buildtoolchain() {
+    if [ "$(uname -m)" = "x86_64" ]; then
+        exiterror "Cannot build toolchain on x86_64. Please use the download."
+    fi
+    if [ "$(uname -r | grep ipfire)" ]; then
+        exiterror "Cannot build toolchain on ipfire. Please use the download."
+    fi
+
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
     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 +258,7 @@ buildtoolchain() {
     lfsmake1 dejagnu
     lfsmake1 gcc		PASS=2
     lfsmake1 binutils	PASS=2
+    lfsmake1 ccache	PASS=2
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
@@ -311,7 +327,6 @@ buildbase() {
     lfsmake2 man
     lfsmake2 mktemp
     lfsmake2 module-init-tools
-    lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
@@ -366,9 +381,9 @@ buildipfire() {
   ipfiremake dahdi			PAE=1 KMOD=1
   ipfiremake cryptodev			PAE=1
   ipfiremake compat-wireless		PAE=1
-  ipfiremake r8169			PAE=1
-  ipfiremake r8168			PAE=1
-  ipfiremake r8101			PAE=1
+#  ipfiremake r8169			PAE=1
+#  ipfiremake r8168			PAE=1
+#  ipfiremake r8101			PAE=1
   ipfiremake e1000			PAE=1
   ipfiremake e1000e			PAE=1
   ipfiremake igb			PAE=1
@@ -382,9 +397,9 @@ buildipfire() {
   ipfiremake dahdi			KMOD=1
   ipfiremake cryptodev
   ipfiremake compat-wireless
-  ipfiremake r8169
-  ipfiremake r8168
-  ipfiremake r8101
+#  ipfiremake r8169
+#  ipfiremake r8168
+#  ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
   ipfiremake igb
@@ -402,6 +417,7 @@ buildipfire() {
   ipfiremake openssl
   ipfiremake curl
   ipfiremake python
+  ipfiremake fireinfo
   ipfiremake libnet
   ipfiremake libnl
   ipfiremake libidn
@@ -416,6 +432,7 @@ buildipfire() {
   ipfiremake slang
   ipfiremake newt
   ipfiremake attr
+  ipfiremake acl
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
@@ -503,6 +520,8 @@ buildipfire() {
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
+  ipfiremake libdnet
+  ipfiremake daq
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
@@ -556,8 +575,6 @@ buildipfire() {
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
-  ipfiremake ocaml
-  ipfiremake mldonkey
   ipfiremake libtorrent
   ipfiremake rtorrent
   ipfiremake ipfireseeder
@@ -665,6 +682,9 @@ buildipfire() {
   ipfiremake ddrescue
   ipfiremake tcl
   ipfiremake imspector
+  ipfiremake miniupnpd
+  ipfiremake client175
+  ipfiremake powertop
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -781,7 +801,6 @@ ipfirepackages() {
 case "$1" in 
 build)
 	clear
-	BUILDMACHINE=`uname -m`
 	PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
 	#only restore on a clean disk
 	if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@ -909,7 +928,6 @@ toolchain)
 	prepareenv
 	beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
 	buildtoolchain
-	BUILDMACHINE=`uname -m`
 	echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
 	test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
 	cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
@@ -921,7 +939,6 @@ toolchain)
 	stdumount
 	;;
 gettoolchain)
-	BUILDMACHINE=`uname -m`
 	# arbitrary name to be updated in case of new toolchain package upload
 	PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
 	if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then