X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=54f3aec7f7b78d581ba13de29441e951cbb36ce4;hp=cc2d3c500799143e2df5ba28de2a8ebf759f3304;hb=9c27eca8e4b7b722fd86add8b6659633ac7c63bc;hpb=c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638 diff --git a/make.sh b/make.sh index cc2d3c5007..54f3aec7f7 100755 --- a/make.sh +++ b/make.sh @@ -17,16 +17,16 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team . # +# Copyright (C) 2007-2011 IPFire-Team . # # # ############################################################################ # 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.9" # Version number +CORE="50" # Core Level (Filename) +PAKFIRE_CORE="49" # 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,20 @@ 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 make PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH @@ -243,6 +259,7 @@ buildtoolchain() { lfsmake1 dejagnu lfsmake1 gcc PASS=2 lfsmake1 binutils PASS=2 + lfsmake1 ccache PASS=2 lfsmake1 ncurses lfsmake1 bash lfsmake1 bzip2 @@ -254,7 +271,7 @@ buildtoolchain() { lfsmake1 grep lfsmake1 gzip lfsmake1 m4 - lfsmake1 make + lfsmake1 make PASS=2 lfsmake1 patch lfsmake1 perl lfsmake1 sed @@ -311,7 +328,6 @@ buildbase() { lfsmake2 man lfsmake2 mktemp lfsmake2 module-init-tools - lfsmake2 mtd lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@ -366,9 +382,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 +398,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 +418,7 @@ buildipfire() { ipfiremake openssl ipfiremake curl ipfiremake python + ipfiremake fireinfo ipfiremake libnet ipfiremake libnl ipfiremake libidn @@ -416,6 +433,7 @@ buildipfire() { ipfiremake slang ipfiremake newt ipfiremake attr + ipfiremake acl ipfiremake libcap ipfiremake pciutils ipfiremake usbutils @@ -503,6 +521,8 @@ buildipfire() { ipfiremake rrdtool ipfiremake setserial ipfiremake setup + ipfiremake libdnet + ipfiremake daq ipfiremake snort ipfiremake oinkmaster ipfiremake squid @@ -556,8 +576,6 @@ buildipfire() { ipfiremake gnump3d ipfiremake libsigc++ ipfiremake applejuice - ipfiremake ocaml - ipfiremake mldonkey ipfiremake libtorrent ipfiremake rtorrent ipfiremake ipfireseeder @@ -665,6 +683,14 @@ buildipfire() { ipfiremake ddrescue ipfiremake tcl ipfiremake imspector + ipfiremake miniupnpd + ipfiremake client175 + ipfiremake powertop + ipfiremake parted + ipfiremake swig + ipfiremake python-m2crypto + ipfiremake crda + ipfiremake libsatsolver echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -742,6 +768,12 @@ buildpackages() { fi mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 + cd $BASEDIR + for i in `ls *.bz2 *.img.gz *.iso`; do + md5sum $i > $i.md5 + done + cd $PWD + # Cleanup stdumount rm -rf $BASEDIR/build/tmp/* @@ -781,7 +813,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 @@ -819,8 +850,10 @@ build) buildpackages beautify build_stage "Checking Logfiles for new Files" - cd .. + + cd $BASEDIR tools/checknewlog.pl + cd $PWD beautify build_end ;; @@ -852,6 +885,7 @@ clean) if [ -h /tools ]; then rm -f /tools fi + rm -f $BASEDIR/ipfire-* beautify message DONE ;; downloadsrc) @@ -909,7 +943,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 +954,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