X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=fe3634f0bb19c0d795f863652e77d22a069f6c2b;hb=26b34186b3788b9ee58246e5b09748ea7b6df6b3;hp=c139bf52751ae37aff328351ed41758c5c867c8d;hpb=5e0a1a503b90c5c80016399308bb2585edba219b;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index c139bf527..fe3634f0b 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,19 +25,19 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="63" # Core Level (Filename) -PAKFIRE_CORE="62" # 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 NICE=10 # Nice level MAX_RETRIES=1 # prefetch/check loop -BUILD_IMAGES=1 # Build USB, Flash and Xen Images +BUILD_IMAGES=1 # Flash and Xen Downloader 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=7 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -179,11 +179,12 @@ prepareenv() { set +h LC_ALL=POSIX if [ -z $MAKETUNING ]; then - if [ "${MACHINE:0:3}" = "arm" ]; then - MAKETUNING="-j2" - else - MAKETUNING="-j6" - fi + CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)" + if [ -z "${CPU_COUNT}" ]; then + CPU_COUNT=1 + fi + + MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))" fi export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -258,7 +259,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 +295,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 +334,11 @@ buildbase() { lfsmake2 gettext lfsmake2 grep lfsmake2 groff + lfsmake2 gperf lfsmake2 gzip lfsmake2 inetutils lfsmake2 iproute2 + lfsmake2 jwhois lfsmake2 kbd lfsmake2 less lfsmake2 make @@ -354,6 +357,7 @@ buildbase() { lfsmake2 util-linux lfsmake2 vim lfsmake2 xz + lfsmake2 paxctl lfsmake2 grub } @@ -372,93 +376,62 @@ buildipfire() { ipfiremake unzip ipfiremake which ipfiremake linux-firmware + ipfiremake dvb-firmwares ipfiremake zd1211-firmware ipfiremake rpi-firmware - ipfiremake fw_ath9k_htc + ipfiremake bc ipfiremake u-boot - # The xen and PAE kernels are only available for x86 if [ "${MACHINE_TYPE}" != "arm" ]; then - ipfiremake linux2 KCFG="-xen" - ipfiremake v4l-dvb KCFG="-xen" -# ipfiremake mISDN KCFG="-xen" - ipfiremake cryptodev KCFG="-xen" - ipfiremake compat-wireless KCFG="-xen" -# ipfiremake r8169 KCFG="-xen" -# ipfiremake r8168 KCFG="-xen" -# ipfiremake r8101 KCFG="-xen" -# ipfiremake e1000 KCFG="-xen" -# ipfiremake e1000e KCFG="-xen" -# ipfiremake igb KCFG="-xen" + # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG="-pae" # ipfiremake kvm-kmod KCFG="-pae" - ipfiremake v4l-dvb KCFG="-pae" - ipfiremake alsa KCFG="-pae" KMOD=1 +# ipfiremake v4l-dvb KCFG="-pae" # 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" -# ipfiremake e1000 KCFG="-pae" # ipfiremake e1000e KCFG="-pae" # ipfiremake igb KCFG="-pae" + # x86 kernel build ipfiremake linux KCFG="" # ipfiremake kvm-kmod KCFG="" - ipfiremake v4l-dvb KCFG="" - ipfiremake alsa KCFG="" KMOD=1 +# ipfiremake v4l-dvb KCFG="" # ipfiremake mISDN KCFG="" ipfiremake cryptodev KCFG="" - ipfiremake compat-wireless KCFG="" +# ipfiremake compat-drivers KCFG="" # ipfiremake r8169 KCFG="" # ipfiremake r8168 KCFG="" # ipfiremake r8101 KCFG="" -# ipfiremake e1000 KCFG="" # ipfiremake e1000e KCFG="" # ipfiremake igb KCFG="" else - # arm-omap kernel build + # arm-rpi (Raspberry Pi) kernel build ipfiremake linux KCFG="-rpi" - ipfiremake v4l-dvb KCFG="-rpi" -# ipfiremake kvm-kmod KCFG="-rpi" -# ipfiremake mISDN KCFG="-rpi" +# ipfiremake v4l-dvb KCFG="-rpi" +# ipfiremake mISDN KCFG="-rpi" NOPCI=1 ipfiremake cryptodev KCFG="-rpi" - ipfiremake compat-wireless KCFG="-rpi" -# ipfiremake r8169 KCFG="-rpi" -# ipfiremake r8168 KCFG="-rpi" -# ipfiremake r8101 KCFG="-rpi" -# ipfiremake e1000 KCFG="-rpi" -# ipfiremake e1000e KCFG="-rpi" -# ipfiremake igb KCFG="-rpi" - - ipfiremake linux KCFG="-omap" -# ipfiremake v4l-dvb KCFG="-omap" -# ipfiremake kvm-kmod KCFG="-omap" -# ipfiremake mISDN KCFG="-omap" - ipfiremake cryptodev KCFG="-omap" - ipfiremake compat-wireless KCFG="-omap" -# ipfiremake r8169 KCFG="-omap" -# ipfiremake r8168 KCFG="-omap" -# ipfiremake r8101 KCFG="-omap" -# ipfiremake e1000 KCFG="-omap" -# ipfiremake e1000e KCFG="-omap" -# ipfiremake igb KCFG="-omap" - - # arm-kirkwood kernel build +# ipfiremake compat-drivers KCFG="-rpi" + + # arm multi platform (Panda, Wandboard ...) kernel build + ipfiremake linux KCFG="-multi" + ipfiremake cryptodev KCFG="-multi" + + # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" - ipfiremake v4l-dvb KCFG="-kirkwood" -# ipfiremake kvm-kmod 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 e1000 KCFG="-kirkwood" -# ipfiremake e1000e KCFG="-kirkwood" +# ipfiremake e1000e KCFG="-kirkwood" # ipfiremake igb KCFG="-kirkwood" fi @@ -478,6 +451,7 @@ buildipfire() { ipfiremake libnet ipfiremake libnl ipfiremake libidn + ipfiremake nasm ipfiremake libjpeg ipfiremake libexif ipfiremake libpng @@ -525,7 +499,9 @@ buildipfire() { ipfiremake mtools ipfiremake initscripts ipfiremake whatmask + ipfiremake libmnl ipfiremake iptables + ipfiremake conntrack-tools ipfiremake libupnp ipfiremake ipaddr ipfiremake iputils @@ -533,15 +509,14 @@ 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 + ipfiremake HTML-Template ipfiremake Compress-Zlib ipfiremake Digest ipfiremake Digest-SHA1 @@ -551,6 +526,7 @@ buildipfire() { ipfiremake Net-IPv4Addr ipfiremake Net_SSLeay ipfiremake IO-Stringy + ipfiremake IO-Socket-SSL ipfiremake Unix-Syslog ipfiremake Mail-Tools ipfiremake MIME-Tools @@ -605,6 +581,7 @@ buildipfire() { ipfiremake ghostscript ipfiremake foomatic ipfiremake hplip + ipfiremake cifs-utils ipfiremake samba ipfiremake sudo ipfiremake mc @@ -639,7 +616,6 @@ buildipfire() { ipfiremake libsigc++ ipfiremake libtorrent ipfiremake rtorrent - ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent @@ -677,8 +653,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 @@ -687,12 +665,12 @@ buildipfire() { ipfiremake mpc ipfiremake git ipfiremake squidclamav - ipfiremake bc ipfiremake vnstat ipfiremake vnstati ipfiremake iw ipfiremake wpa_supplicant ipfiremake hostapd + ipfiremake pycurl ipfiremake urlgrabber ipfiremake syslinux ipfiremake tftpd @@ -711,6 +689,7 @@ buildipfire() { ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext + ipfiremake perl-Sort-Naturally ipfiremake vdradmin ipfiremake miau ipfiremake netsnmpd @@ -751,7 +730,6 @@ buildipfire() { ipfiremake python-progressbar ipfiremake python-xattr ipfiremake intltool - ipfiremake pakfire3-deps ipfiremake transmission ipfiremake dpfhack ipfiremake lcd4linux @@ -761,6 +739,40 @@ buildipfire() { ipfiremake acpid ipfiremake fping ipfiremake telnet + ipfiremake xinetd + ipfiremake libgpg-error + ipfiremake libassuan + 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 + ipfiremake wavemon + ipfiremake iptraf-ng + ipfiremake iotop echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -770,11 +782,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() { @@ -782,7 +802,6 @@ buildinstaller() { LOGFILE="$BASEDIR/log/_build.installer.log" export LOGFILE ipfiremake as86 - ipfiremake mbr ipfiremake memtest ipfiremake installer installmake strip @@ -821,9 +840,6 @@ buildpackages() { # Check if there is a loop device for building in virtual environments if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then - if [ "${MACHINE_TYPE}" != "arm" ]; then - ipfiremake usb-stick - fi ipfiremake flash-images fi @@ -831,14 +847,7 @@ buildpackages() { ipfirepackages - # Check if there is a loop device for building in virtual environments - if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then - cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ - cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/ - ipfiremake xen-image - rm -rf $LFS/install/packages/linux-xen-*.ipfire - rm -rf $LFS/install/packages/meta-linux-xen - fi + ipfiremake xen-image mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 cd $BASEDIR @@ -871,7 +880,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 @@ -929,6 +938,7 @@ build) cd $BASEDIR tools/checknewlog.pl + tools/checkwronginitlinks cd $PWD beautify build_end