X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=15b049eed633037e23523fcc403965515ac4df16;hp=2f69a4c921529493af8f9247915f2b61b113300e;hb=176b9e030d5a41b15824cb8ad4a73e9efb47a2dc;hpb=03ca2036e0a9316d98a60886f362876d818951f5 diff --git a/make.sh b/make.sh index 2f69a4c921..15b049eed6 100755 --- a/make.sh +++ b/make.sh @@ -22,19 +22,22 @@ ############################################################################ # -NAME="IPFire" # Software name -SNAME="ipfire" # Short name -VERSION="2.5" -CORE="31" -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 +NAME="IPFire" # Software name +SNAME="ipfire" # Short name +VERSION="2.7" # Version number +CORE="40" # Core Level (Filename) +PAKFIRE_CORE="39" # 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 +NICE=10 # Nice level +MAX_RETRIES=1 # prefetch/check loop +BUILD_IMAGES=1 # Build USB, Flash and Xen Images KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` -GIT_TAG=$(git tag | tail -1) -TOOLCHAINVER=1 +GIT_TAG=$(git tag | tail -1) # Git Tag +GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit +TOOLCHAINVER=2 IPFVER="full" # Which versions should be compiled? (full|devel) # Debian specific settings @@ -334,32 +337,39 @@ buildipfire() { ipfiremake libusb ipfiremake libpcap ipfiremake ppp - ipfiremake rp-pppoe ipfiremake pptp ipfiremake unzip ipfiremake which -# ipfiremake linux XEN=1 -# ipfiremake atl2 XEN=1 -# ipfiremake hso XEN=1 -# ipfiremake e1000e XEN=1 -# ipfiremake kqemu XEN=1 -# ipfiremake v4l-dvb XEN=1 -# ipfiremake madwifi XEN=1 -## ipfiremake alsa XEN=1 KMOD=1 -# ipfiremake openswan XEN=1 KMOD=1 -# ipfiremake mISDN XEN=1 -# ipfiremake compat-wireless XEN=1 + ipfiremake xz + ipfiremake linux-firmware + ipfiremake linux XEN=1 + ipfiremake kqemu XEN=1 + ipfiremake v4l-dvb XEN=1 + ipfiremake madwifi XEN=1 + ipfiremake mISDN XEN=1 + ipfiremake dahdi XEN=1 KMOD=1 + ipfiremake cryptodev XEN=1 + ipfiremake compat-wireless XEN=1 + ipfiremake r8169 XEN=1 + ipfiremake r8168 XEN=1 + ipfiremake r8101 XEN=1 + ipfiremake e1000 XEN=1 + ipfiremake e1000e XEN=1 ipfiremake linux - ipfiremake atl2 - ipfiremake hso - ipfiremake e1000e ipfiremake kqemu + ipfiremake kvm-kmod ipfiremake v4l-dvb ipfiremake madwifi ipfiremake alsa KMOD=1 - ipfiremake openswan KMOD=1 ipfiremake mISDN + ipfiremake dahdi KMOD=1 + ipfiremake cryptodev ipfiremake compat-wireless + ipfiremake r8169 + ipfiremake r8168 + ipfiremake r8101 + ipfiremake e1000 + ipfiremake e1000e ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio @@ -524,8 +534,6 @@ buildipfire() { ipfiremake xvid ipfiremake libmpeg2 ipfiremake cmake - ipfiremake libpri - ipfiremake asterisk ipfiremake gnump3d ipfiremake libsigc++ ipfiremake applejuice @@ -536,6 +544,7 @@ buildipfire() { ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper + ipfiremake libevent ipfiremake portmap ipfiremake nfs ipfiremake nmap @@ -545,21 +554,22 @@ buildipfire() { ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd - ipfiremake openswan + ipfiremake strongswan ipfiremake lsof ipfiremake centerim ipfiremake br2684ctl ipfiremake pcmciautils ipfiremake lm_sensors + ipfiremake liboping ipfiremake collectd ipfiremake lcd4linux - ipfiremake tcptrack ipfiremake teamspeak ipfiremake elinks ipfiremake igmpproxy ipfiremake fbset ipfiremake sdl ipfiremake qemu + ipfiremake qemu-kqemu ipfiremake sane ipfiremake netpbm ipfiremake phpSANE @@ -570,6 +580,7 @@ buildipfire() { ipfiremake freefont ipfiremake directfb ipfiremake dfb++ + ipfiremake faad2 ipfiremake ffmpeg ipfiremake videolan ipfiremake vdr @@ -577,11 +588,11 @@ buildipfire() { ipfiremake icecast ipfiremake icegenerator ipfiremake mpd + ipfiremake libmpdclient ipfiremake mpc ipfiremake git ipfiremake squidclamav ipfiremake bc - ipfiremake esniper ipfiremake vnstat ipfiremake vnstati ipfiremake iw @@ -599,7 +610,6 @@ buildipfire() { ipfiremake netcat ipfiremake 7zip ipfiremake lynis - #ipfiremake cryptsetup ipfiremake splix ipfiremake streamripper ipfiremake sshfs @@ -609,20 +619,30 @@ buildipfire() { ipfiremake sslh ipfiremake perl-gettext ipfiremake vdradmin -# ipfiremake x11libs -# ipfiremake xen ipfiremake miau ipfiremake netsnmpd ipfiremake perl-DBI ipfiremake perl-DBD-mysql - ipfiremake lcr ipfiremake cacti ipfiremake icecc - ipfiremake open-vm-tools + ipfiremake openvmtools ipfiremake nagiosql ipfiremake iftop ipfiremake motion ipfiremake joe + ipfiremake nut + ipfiremake watchdog + ipfiremake libpri + ipfiremake dahdi + ipfiremake asterisk + ipfiremake lcr + ipfiremake usb_modeswitch + ipfiremake zerofree + ipfiremake mdadm + ipfiremake eject + ipfiremake pound + ipfiremake minicom + ipfiremake ddrescue echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -631,8 +651,12 @@ buildipfire() { git status >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild - echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine - echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release + echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine + if [ "$GIT_BRANCH" = "master" ]; then + echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release + else + echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release + fi } buildinstaller() { @@ -704,7 +728,7 @@ buildpackages() { ipfiremake cdrom ED=$IPFVER # Check if there is a loop device for building in virtual environments - if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then + if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then ipfiremake usb-stick ED=$IPFVER ipfiremake flash-images ED=$IPFVER fi @@ -713,13 +737,15 @@ buildpackages() { ipfirepackages -# # Check if there is a loop device for building in virtual environments -# if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then -# cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ -# ipfiremake xen-image ED=$IPFVER -# rm -rf $LFS/install/packages/linux-xen-*.ipfire -# fi -# mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 + # Check if there is a loop device for building in virtual environments + if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then + cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ + cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/ + ipfiremake xen-image ED=$IPFVER + rm -rf $LFS/install/packages/linux-xen-*.ipfire + rm -rf $LFS/install/packages/meta-linux-xen + fi + mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 # Cleanup stdumount @@ -890,7 +916,7 @@ toolchain) 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 $BASEDIR/cache/toolchains + 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 \ build/{bin,etc,usr/bin,usr/local} \ build/tools/{bin,etc,*-linux-gnu,include,lib,libexec,sbin,share,var} \ @@ -905,7 +931,7 @@ gettoolchain) PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'` - test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains + test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE cd $BASEDIR/cache/toolchains wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null @@ -976,7 +1002,7 @@ 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} ${GIT_BRANCH} $3 + git push ${GIT_URL} $3 ;; log) [ -z $GIT_TAG ] || LAST_TAG=$GIT_TAG