X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=d6e235a7bed8f0eb37676cec11042f20dfa289e9;hp=98fc8b6658be845153696a52cf8df3575bbe506c;hb=533bebcc4241ddfdfde8794bcf76bdf028fa7f90;hpb=9232685b8c68eb9b9d7523906f846a2696abbdad diff --git a/make.sh b/make.sh index 98fc8b6658..d6e235a7be 100755 --- a/make.sh +++ b/make.sh @@ -24,13 +24,15 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.1" # Version number +VERSION="2.3-test" +GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level MAX_RETRIES=1 # prefetch/check loop KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` +GIT_TAG=$(git tag | tail -1) IPFVER="full" # Which versions should be compiled? (full|devel) @@ -175,7 +177,7 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - MAKETUNING="-j6" + MAKETUNING="-j8" export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -331,26 +333,32 @@ buildipfire() { ipfiremake ppp ipfiremake rp-pppoe ipfiremake unzip - ipfiremake linux SMP=1 - ipfiremake ipp2p SMP=1 - ipfiremake zaptel SMP=1 - ipfiremake r8169 SMP=1 - ipfiremake r8168 SMP=1 - ipfiremake mcs7830 SMP=1 - ipfiremake atl1 SMP=1 - ipfiremake dm9601 SMP=1 - ipfiremake kqemu SMP=1 - ipfiremake sane KMOD=1 SMP=1 +# ipfiremake linux SMP=1 +# ipfiremake linux-fusion SMP=1 +# ipfiremake ipp2p SMP=1 +# ipfiremake atl2 SMP=1 +# ipfiremake kqemu SMP=1 +# ipfiremake v4l-dvb SMP=1 +# ipfiremake madwifi SMP=1 +# ipfiremake alsa KMOD=1 SMP=1 +# ipfiremake sane KMOD=1 SMP=1 +# ipfiremake openswan KMOD=1 SMP=1 + ipfiremake linux25 + ipfiremake atl2 KVER=2.6.25.17 + ipfiremake kqemu KVER=2.6.25.17 + ipfiremake v4l-dvb KVER=2.6.25.17 + ipfiremake madwifi KVER=2.6.25.17 + ipfiremake alsa KMOD=1 KVER=2.6.25.17 ipfiremake linux - ipfiremake ipp2p - ipfiremake zaptel - ipfiremake r8169 + ipfiremake atl2 ipfiremake r8168 - ipfiremake mcs7830 - ipfiremake atl1 - ipfiremake dm9601 + ipfiremake r8169 ipfiremake kqemu + ipfiremake v4l-dvb + ipfiremake madwifi + ipfiremake alsa KMOD=1 ipfiremake sane KMOD=1 + ipfiremake openswan KMOD=1 ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio @@ -414,9 +422,7 @@ buildipfire() { ipfiremake whatmask ipfiremake iptables ipfiremake libupnp - ipfiremake ipp2p IPT=1 ipfiremake linux-igd - ipfiremake ipac-ng ipfiremake ipaddr ipfiremake iptstate ipfiremake iputils @@ -453,20 +459,23 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser + ipfiremake python-setuptools + ipfiremake python-clientform + ipfiremake python-mechanize + ipfiremake python-feedparser + ipfiremake python-rssdler ipfiremake glib ipfiremake GeoIP ipfiremake fwhits ipfiremake noip_updater ipfiremake ntp ipfiremake openssh - ipfiremake openswan ipfiremake rrdtool ipfiremake setserial ipfiremake setup ipfiremake snort ipfiremake oinkmaster ipfiremake squid - ipfiremake squid-graph ipfiremake squidguard ipfiremake calamaris ipfiremake tcpdump @@ -501,13 +510,13 @@ buildipfire() { ipfiremake spamassassin ipfiremake amavisd ipfiremake alsa - ipfiremake mpg123 ipfiremake mpfire ipfiremake guardian ipfiremake libid3tag ipfiremake libmad ipfiremake libogg ipfiremake libvorbis + ipfiremake libdvbpsi ipfiremake lame ipfiremake sox ipfiremake libshout @@ -533,7 +542,6 @@ buildipfire() { ipfiremake portmap ipfiremake nfs ipfiremake nmap - ipfiremake mbmon ipfiremake ncftp ipfiremake etherwake ipfiremake bwm-ng @@ -541,18 +549,19 @@ buildipfire() { ipfiremake sysstat ipfiremake vsftpd ipfiremake which + ipfiremake openswan ipfiremake lsof ipfiremake centerim ipfiremake br2684ctl ipfiremake pcmciautils + ipfiremake lm_sensors ipfiremake collectd ipfiremake lcd4linux - ipfiremake neon - ipfiremake subversion ipfiremake tcptrack ipfiremake teamspeak ipfiremake elinks ipfiremake igmpproxy + ipfiremake fbset ipfiremake sdl ipfiremake qemu ipfiremake sane @@ -561,9 +570,10 @@ buildipfire() { ipfiremake tunctl ipfiremake nagios ipfiremake ebtables - ipfiremake arptables ipfiremake fontconfig ipfiremake freefont + ipfiremake directfb + ipfiremake dfb++ ipfiremake ffmpeg ipfiremake videolan ipfiremake vdr @@ -571,13 +581,35 @@ buildipfire() { ipfiremake git ipfiremake squidclamav ipfiremake bc + ipfiremake esniper + ipfiremake vnstat + ipfiremake vnstati + ipfiremake wpa_supplicant + ipfiremake hostapd + ipfiremake urlgrabber + ipfiremake syslinux + ipfiremake tftp-hpa + ipfiremake cpufrequtils + ipfiremake dbus + ipfiremake bluetooth + ipfiremake gutenprint + ipfiremake apcupsd + ipfiremake iperf + ipfiremake netcat + echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild + cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild + echo >> $BASEDIR/build/var/ipfire/firebuild + git log -1 >> $BASEDIR/build/var/ipfire/firebuild + echo >> $BASEDIR/build/var/ipfire/firebuild + git status >> $BASEDIR/build/var/ipfire/firebuild + echo >> $BASEDIR/build/var/ipfire/firebuild + cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild } buildinstaller() { # Run installer scripts one by one LOGFILE="$BASEDIR/log/_build.installer.log" export LOGFILE - ipfiremake syslinux ipfiremake as86 ipfiremake mbr ipfiremake memtest @@ -634,6 +666,10 @@ buildpackages() { rm -f $BASEDIR/doc/packages-list # packages-list.txt is ready to be displayed for wiki page beautify message DONE + + # Update changelog + cd $BASEDIR + $0 git log # Create images for install ipfiremake cdrom ED=full @@ -642,7 +678,10 @@ buildpackages() { if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then ipfiremake usb-stick fi - mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1 + + # Create updater package + ipfiremake updater + mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages @@ -721,6 +760,11 @@ build) beautify build_stage "Building packages" buildpackages + + beautify build_stage "Checking Logfiles for new Files" + cd .. + tools/checknewlog.pl + beautify build_end ;; shell) @@ -830,7 +874,7 @@ gettoolchain) cd $BASEDIR/cache/toolchains wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null if [ $? -ne 0 ]; then - echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE + echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE else if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE @@ -861,6 +905,8 @@ othersrc) git) case "$2" in update|up) + ## REMOVES ALL UNCOMMITTED CHANGES! + [ "$3" == "--force" ] && git checkout -f git pull ;; commit|ci) @@ -894,8 +940,14 @@ git) [ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first." GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x" - git push ${GIT_URL} master + git push ${GIT_URL} ${GIT_BRANCH} ;; + log) + [ -z $GIT_TAG ] || LAST_TAG=$GIT_TAG + [ -z $LAST_TAG ] || EXT="$LAST_TAG..HEAD" + + git log -n 500 --no-merges --pretty=medium --shortstat $EXT > $BASEDIR/doc/ChangeLog + ;; esac ;; uploadsrc)