X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=43b08d0865fc50125441001da6ca58ac764162e5;hp=b2cdaea0d2cda2065ac87e6b3d717cf8d52ec51c;hb=7a5ed24ecc0ec2476f09478e6fe74e1f833b4b29;hpb=483b776876b047c9c207c34bea991e64206becaa diff --git a/make.sh b/make.sh index b2cdaea0d2..43b08d0865 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) @@ -331,26 +333,26 @@ 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 linux +# ipfiremake linux-fusion ipfiremake ipp2p - ipfiremake zaptel - ipfiremake r8169 - ipfiremake r8168 - ipfiremake mcs7830 - ipfiremake atl1 - ipfiremake dm9601 + ipfiremake atl2 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 +416,8 @@ buildipfire() { ipfiremake whatmask ipfiremake iptables ipfiremake libupnp - ipfiremake ipp2p IPT=1 +# ipfiremake ipp2p IPT=1 ipfiremake linux-igd - ipfiremake ipac-ng ipfiremake ipaddr ipfiremake iptstate ipfiremake iputils @@ -459,14 +460,12 @@ buildipfire() { 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 +500,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 @@ -517,7 +516,7 @@ buildipfire() { ipfiremake mpc ipfiremake xvid ipfiremake libmpeg2 - ipfiremake videolan + ipfiremake cmake ipfiremake libpri ipfiremake asterisk ipfiremake gnump3d @@ -533,7 +532,6 @@ buildipfire() { ipfiremake portmap ipfiremake nfs ipfiremake nmap - ipfiremake mbmon ipfiremake ncftp ipfiremake etherwake ipfiremake bwm-ng @@ -541,18 +539,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,18 +560,44 @@ buildipfire() { ipfiremake tunctl ipfiremake nagios ipfiremake ebtables - ipfiremake arptables ipfiremake fontconfig ipfiremake freefont + ipfiremake directfb + ipfiremake dfb++ + ipfiremake ffmpeg + ipfiremake videolan ipfiremake vdr + ipfiremake w_scan 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 + 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 @@ -629,6 +654,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 @@ -637,7 +666,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 @@ -711,18 +743,15 @@ build) beautify build_stage "Building IPFire" buildipfire - # Setzen des IPFire Builds - if [ "$SVN_REVISION" ]; then - echo "$SVN_REVISION" > $BASEDIR/build/var/ipfire/firebuild - else - echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild - fi - beautify build_stage "Building installer" buildinstaller beautify build_stage "Building packages" buildpackages + + beautify build_stage "Checking Logfiles for new Files" + tools/checknewlog.pl + beautify build_end ;; shell) @@ -731,11 +760,6 @@ shell) prepareenv entershell ;; -changelog) - echo -n "Loading new Changelog from SVN: " - svn log http://svn.ipfire.org/svn/ipfire > doc/ChangeLog - beautify message DONE - ;; clean) echo -en "${BOLD}Cleaning build directory...${NORMAL}" for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do @@ -837,7 +861,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 @@ -901,8 +925,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) @@ -1014,8 +1044,7 @@ lang) ;; "") clear - svn info - select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help" + select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "LOG: Tail" "Help" do case $name in "IPFIRE: Downloadsrc") @@ -1033,9 +1062,6 @@ lang) "IPFIRE: Clean") $0 clean ;; - "SVN: Update") - $0 svn update - ;; "Help") echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}" cat doc/make.sh-usage