X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=b18e02c26bdc94821f9eed064ac6fbf7e6930f3d;hp=9dbea0d9d3cb98a960a5736b8c6178411b49b3b4;hb=a7b1824c6c543afe1884dbb62e80ba219bc90fd1;hpb=f28d0ddc6d42c7787dbdf91c4a4555675bfd18f8 diff --git a/make.sh b/make.sh index 9dbea0d9d3..b18e02c26b 100644 --- a/make.sh +++ b/make.sh @@ -33,6 +33,12 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` + # Setzen des IPFire Builds + if [ -e ./.svn ]; then + FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'` +# VERSION="$VERSION (Build:$FIREBUILD)" + fi + # Debian specific settings if [ ! -e /etc/debian_version ]; then FULLPATH=`which $0` @@ -55,6 +61,7 @@ mkdir $BASEDIR/log/ 2>/dev/null if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE -o 'i486' = $MACHINE -o 'i386' = $MACHINE ]; then + echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" | tee -a $LOGFILE MACHINE=i386 BUILDTARGET=i386-pc-linux-gnu @@ -672,6 +679,10 @@ buildipcop() { ipcopmake java ipcopmake libtiff ipcopmake libjpeg + ipcopmake lcms + ipcopmake libmng + ipcopmake freetype + ipcopmake bootsplash ipcopmake libxml2 ipcopmake spandsp ipcopmake lzo @@ -894,8 +905,17 @@ build) echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE prepareenv fi + buildbase buildipcop + + # Setzen des IPFire Builds + if [ $FIREBUILD ]; then + echo "$FIREBUILD" > $CONFIG_ROOT/firebuild + else + echo "_(OvO)_" > $CONFIG_ROOT/firebuild + fi + buildinstaller buildpackages ;;