X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=7b63bd464f9baeec06b35deb217ca8567a2ff301;hb=71ce1f7a0e85cd00097acb3d68ff57ac1e5f60ee;hp=38254b0f283cabbe9ee0525672c10676b774d296;hpb=58ca93ccba8d26feb00304e5b289da0d7305226a;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index 38254b0f2..7b63bd464 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # 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-2012 IPFire Team . # +# Copyright (C) 2007-2013 IPFire Team . # # # ############################################################################ # @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="63" # Core Level (Filename) -PAKFIRE_CORE="63" # Core Level (PAKFIRE) +CORE="73" # Core Level (Filename) +PAKFIRE_CORE="72" # 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,7 +37,7 @@ 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=5 +TOOLCHAINVER=6 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -258,7 +258,7 @@ buildtoolchain() { lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 - lfsmake1 linux2 TOOLS=1 HEADERS=1 + lfsmake1 linux TOOLS=1 KCFG="-headers" lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 lfsmake1 binutils PASS=2 @@ -294,7 +294,7 @@ buildbase() { LOGFILE="$BASEDIR/log/_build.base.log" export LOGFILE lfsmake2 stage2 - lfsmake2 linux2 HEADERS=1 + lfsmake2 linux KCFG="-headers" lfsmake2 man-pages lfsmake2 glibc lfsmake2 tzdata @@ -333,9 +333,11 @@ buildbase() { lfsmake2 gettext lfsmake2 grep lfsmake2 groff + lfsmake2 gperf lfsmake2 gzip lfsmake2 inetutils lfsmake2 iproute2 + lfsmake2 jwhois lfsmake2 kbd lfsmake2 less lfsmake2 make @@ -372,6 +374,7 @@ buildipfire() { ipfiremake unzip ipfiremake which ipfiremake linux-firmware + ipfiremake dvb-firmwares ipfiremake zd1211-firmware ipfiremake rpi-firmware ipfiremake u-boot @@ -383,7 +386,7 @@ buildipfire() { ipfiremake v4l-dvb KCFG="-xen" ipfiremake mISDN KCFG="-xen" ipfiremake cryptodev KCFG="-xen" - ipfiremake compat-wireless KCFG="-xen" + ipfiremake compat-drivers KCFG="-xen" ipfiremake r8169 KCFG="-xen" ipfiremake r8168 KCFG="-xen" ipfiremake r8101 KCFG="-xen" @@ -393,12 +396,11 @@ buildipfire() { # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG="-pae" -# ipfiremake kvm-kmod KCFG="-pae" + ipfiremake kvm-kmod KCFG="-pae" ipfiremake v4l-dvb KCFG="-pae" - ipfiremake alsa KCFG="-pae" KMOD=1 ipfiremake mISDN KCFG="-pae" ipfiremake cryptodev KCFG="-pae" - ipfiremake compat-wireless KCFG="-pae" + ipfiremake compat-drivers KCFG="-pae" ipfiremake r8169 KCFG="-pae" ipfiremake r8168 KCFG="-pae" ipfiremake r8101 KCFG="-pae" @@ -407,12 +409,11 @@ buildipfire() { # x86 kernel build ipfiremake linux KCFG="" -# ipfiremake kvm-kmod KCFG="" + ipfiremake kvm-kmod KCFG="" ipfiremake v4l-dvb KCFG="" - ipfiremake alsa KCFG="" KMOD=1 ipfiremake mISDN KCFG="" ipfiremake cryptodev KCFG="" - ipfiremake compat-wireless KCFG="" + ipfiremake compat-drivers KCFG="" ipfiremake r8169 KCFG="" ipfiremake r8168 KCFG="" ipfiremake r8101 KCFG="" @@ -425,25 +426,25 @@ buildipfire() { ipfiremake v4l-dvb KCFG="-rpi" ipfiremake mISDN KCFG="-rpi" NOPCI=1 ipfiremake cryptodev KCFG="-rpi" - ipfiremake compat-wireless KCFG="-rpi" + ipfiremake compat-drivers KCFG="-rpi" # arm-omap (Panda Board) kernel build ipfiremake linux KCFG="-omap" ipfiremake v4l-dvb KCFG="-omap" ipfiremake mISDN KCFG="-omap" NOPCI=1 ipfiremake cryptodev KCFG="-omap" - ipfiremake compat-wireless KCFG="-omap" + ipfiremake compat-drivers KCFG="-omap" # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" ipfiremake v4l-dvb KCFG="-kirkwood" ipfiremake mISDN KCFG="-kirkwood" ipfiremake cryptodev KCFG="-kirkwood" - ipfiremake compat-wireless KCFG="-kirkwood" + ipfiremake compat-drivers KCFG="-kirkwood" ipfiremake r8169 KCFG="-kirkwood" ipfiremake r8168 KCFG="-kirkwood" ipfiremake r8101 KCFG="-kirkwood" - ipfiremake e1000e KCFG="-kirkwood" +# ipfiremake e1000e KCFG="-kirkwood" ipfiremake igb KCFG="-kirkwood" fi @@ -463,6 +464,7 @@ buildipfire() { ipfiremake libnet ipfiremake libnl ipfiremake libidn + ipfiremake nasm ipfiremake libjpeg ipfiremake libexif ipfiremake libpng @@ -510,7 +512,9 @@ buildipfire() { ipfiremake mtools ipfiremake initscripts ipfiremake whatmask + ipfiremake libmnl ipfiremake iptables + ipfiremake conntrack-tools ipfiremake libupnp ipfiremake ipaddr ipfiremake iputils @@ -518,12 +522,10 @@ buildipfire() { ipfiremake mISDNuser ipfiremake capi4k-utils ipfiremake hwdata - ipfiremake kudzu ipfiremake logrotate ipfiremake logwatch ipfiremake misc-progs ipfiremake nano - ipfiremake nasm ipfiremake URI ipfiremake HTML-Tagset ipfiremake HTML-Parser @@ -536,6 +538,7 @@ buildipfire() { ipfiremake Net-IPv4Addr ipfiremake Net_SSLeay ipfiremake IO-Stringy + ipfiremake IO-Socket-SSL ipfiremake Unix-Syslog ipfiremake Mail-Tools ipfiremake MIME-Tools @@ -590,6 +593,7 @@ buildipfire() { ipfiremake ghostscript ipfiremake foomatic ipfiremake hplip + ipfiremake cifs-utils ipfiremake samba ipfiremake sudo ipfiremake mc @@ -624,7 +628,6 @@ buildipfire() { ipfiremake libsigc++ ipfiremake libtorrent ipfiremake rtorrent - ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent @@ -662,8 +665,10 @@ buildipfire() { ipfiremake dfb++ ipfiremake faad2 ipfiremake ffmpeg - ipfiremake videolan ipfiremake vdr + ipfiremake vdr_streamdev + ipfiremake vdr_vnsiserver3 + ipfiremake vdr_epgsearch ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator @@ -697,6 +702,7 @@ buildipfire() { ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext + ipfiremake perl-Sort-Naturally ipfiremake vdradmin ipfiremake miau ipfiremake netsnmpd @@ -751,6 +757,31 @@ buildipfire() { ipfiremake gpgme ipfiremake pygpgme ipfiremake pakfire3 + ipfiremake stress + ipfiremake libstatgrab + ipfiremake sarg + ipfiremake fstrim + ipfiremake check_mk_agent + ipfiremake libdaemon + ipfiremake avahi + ipfiremake nginx + ipfiremake sendEmail + ipfiremake sysbench + ipfiremake strace + ipfiremake ipfire-netboot + ipfiremake lcdproc + ipfiremake bitstream + ipfiremake multicat + ipfiremake keepalived + ipfiremake ipvsadm + ipfiremake perl-Carp-Clan + ipfiremake perl-Date-Calc + ipfiremake perl-Date-Manip + ipfiremake perl-File-Tail + ipfiremake perl-TimeDate + ipfiremake swatch + ipfiremake tor + ipfiremake arm echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -760,11 +791,19 @@ buildipfire() { echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine - if [ "$GIT_BRANCH" = "master" -o "$GIT_BRANCH" = "next" ]; then - echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release + if [ "$(git status -s | wc -l)" == "0" ]; then + GIT_STATUS="" else - echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release + GIT_STATUS="-dirty" fi + case "$GIT_BRANCH" in + core*|beta?|rc?) + echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release + ;; + *) + echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release + ;; + esac } buildinstaller() { @@ -863,7 +902,7 @@ ipfirepackages() { ipfiremake core-updates local i - for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do + for i in $(find $BASEDIR/config/rootfiles/packages{/${MACHINE},} -maxdepth 1 -type f); do i=$(basename ${i}) if [ -e $BASEDIR/lfs/$i ]; then ipfiredist $i @@ -921,6 +960,7 @@ build) cd $BASEDIR tools/checknewlog.pl + tools/checkwronginitlinks cd $PWD beautify build_end