X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=a531e4b7483f80b26bb45e87909bcc09cc674ad9;hp=3271a9e63db776be8eec0c60c68a73b6c24058b7;hb=f5bbd27c5c2d3fc067a15fab26fc21b443453cbe;hpb=a3f7164f985b1af190e18f45c1d86ad59bd671d3 diff --git a/make.sh b/make.sh index 3271a9e63..a531e4b74 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-2011 IPFire-Team . # +# Copyright (C) 2007-2012 IPFire Team . # # # ############################################################################ # @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="54" # Core Level (Filename) -PAKFIRE_CORE="53" # Core Level (PAKFIRE) +CORE="62" # Core Level (Filename) +PAKFIRE_CORE="61" # 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=1 +TOOLCHAINVER=3 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -222,16 +222,35 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache export CCACHE_COMPRESS=1 - export CCACHE_HASHDIR=1 + export CCACHE_COMPILERCHECK="none" # Remove pre-install list of installed files in case user erase some files before rebuild rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null } buildtoolchain() { - if [ "$(uname -m)" = "x86_64" ]; then - exiterror "Cannot build toolchain on x86_64. Please use the download." - fi + local error=false + case "${MACHINE}:$(uname -m)" in + # x86 + i586:i586|i586:i686) + # These are working. + ;; + i586:*) + error=true + ;; + + # ARM + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l) + # These are working. + ;; + armv5tel:*) + error=true + ;; + esac + + ${error} && \ + exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any." + if [ "$(uname -r | grep ipfire)" ]; then exiterror "Cannot build toolchain on ipfire. Please use the download." fi @@ -241,18 +260,15 @@ buildtoolchain() { NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} ORG_PATH=$PATH - export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH lfsmake1 ccache PASS=1 lfsmake1 make PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 - if [ "${MACHINE_TYPE}" = "arm" ]; then - lfsmake1 linux TOOLS=1 HEADERS=1 - else - lfsmake1 linux-libc-header - fi + export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH + lfsmake1 linux2 TOOLS=1 HEADERS=1 lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 + lfsmake1 fake-environ lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu @@ -286,11 +302,7 @@ buildbase() { LOGFILE="$BASEDIR/log/_build.base.log" export LOGFILE lfsmake2 stage2 - if [ "${MACHINE_TYPE}" = "arm" ]; then - lfsmake2 linux HEADERS=1 - else - lfsmake2 linux-libc-header - fi + lfsmake2 linux2 HEADERS=1 lfsmake2 man-pages lfsmake2 glibc lfsmake2 tzdata @@ -364,90 +376,113 @@ buildipfire() { ipfiremake xz ipfiremake linux-firmware ipfiremake zd1211-firmware + ipfiremake rpi-firmware ipfiremake fw_ath9k_htc ipfiremake u-boot # The xen and PAE kernels are only available for x86 if [ "${MACHINE_TYPE}" != "arm" ]; then - ipfiremake linux KCFG="-xen" - ipfiremake kqemu KCFG="-xen" - ipfiremake v4l-dvb KCFG="-xen" - ipfiremake madwifi KCFG="-xen" - ipfiremake mISDN KCFG="-xen" - ipfiremake dahdi KCFG="-xen" KMOD=1 + ipfiremake linux2 KCFG="-xen" +# ipfiremake v4l-dvb KCFG="-xen" +# ipfiremake mISDN KCFG="-xen" +# ipfiremake dahdi KCFG="-xen" KMOD=1 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" +# ipfiremake r8169 KCFG="-xen" +# ipfiremake r8168 KCFG="-xen" +# ipfiremake r8101 KCFG="-xen" +# ipfiremake e1000 KCFG="-xen" +# ipfiremake e1000e KCFG="-xen" +# ipfiremake igb KCFG="-xen" + ipfiremake linux KCFG="-pae" - ipfiremake kqemu KCFG="-pae" - ipfiremake kvm-kmod KCFG="-pae" - ipfiremake v4l-dvb KCFG="-pae" - ipfiremake madwifi KCFG="-pae" +# ipfiremake kvm-kmod KCFG="-pae" +# ipfiremake v4l-dvb KCFG="-pae" ipfiremake alsa KCFG="-pae" KMOD=1 - ipfiremake mISDN KCFG="-pae" - ipfiremake dahdi KCFG="-pae" KMOD=1 +# ipfiremake mISDN KCFG="-pae" +# ipfiremake dahdi KCFG="-pae" KMOD=1 ipfiremake cryptodev KCFG="-pae" ipfiremake compat-wireless 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" +# ipfiremake e1000 KCFG="-pae" +# ipfiremake e1000e KCFG="-pae" +# ipfiremake igb KCFG="-pae" + ipfiremake linux KCFG="" - ipfiremake v4l-dvb KCFG="" - ipfiremake kqemu KCFG="" - ipfiremake kvm-kmod KCFG="" - ipfiremake madwifi KCFG="" +# ipfiremake kvm-kmod KCFG="" +# ipfiremake v4l-dvb KCFG="" ipfiremake alsa KCFG="" KMOD=1 - ipfiremake mISDN KCFG="" - ipfiremake dahdi KCFG="" KMOD=1 +# ipfiremake mISDN KCFG="" +# ipfiremake dahdi KCFG="" KMOD=1 ipfiremake cryptodev KCFG="" ipfiremake compat-wireless KCFG="" # ipfiremake r8169 KCFG="" # ipfiremake r8168 KCFG="" # ipfiremake r8101 KCFG="" - ipfiremake e1000 KCFG="" - ipfiremake e1000e KCFG="" - ipfiremake igb KCFG="" +# ipfiremake e1000 KCFG="" +# ipfiremake e1000e KCFG="" +# ipfiremake igb KCFG="" + else + # arm-omap kernel build + ipfiremake linux KCFG="-rpi" +# ipfiremake v4l-dvb KCFG="-rpi" +# ipfiremake kvm-kmod KCFG="-rpi" +# ipfiremake mISDN KCFG="-rpi" +# ipfiremake dahdi KCFG="-rpi" KMOD=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 dahdi KCFG="-omap" KMOD=1 + 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-versatile kernel build ipfiremake linux KCFG="-versatile" - ipfiremake v4l-dvb KCFG="-versatile" - ipfiremake kqemu KCFG="-versatile" - ipfiremake kvm-kmod KCFG="-versatile" - ipfiremake madwifi KCFG="-versatile" - ipfiremake mISDN KCFG="-versatile" - ipfiremake dahdi KCFG="-versatile" KMOD=1 +# ipfiremake v4l-dvb KCFG="-versatile" +# ipfiremake kvm-kmod KCFG="-versatile" +# ipfiremake mISDN KCFG="-versatile" +# ipfiremake dahdi KCFG="-versatile" KMOD=1 ipfiremake cryptodev KCFG="-versatile" ipfiremake compat-wireless KCFG="-versatile" -# ipfiremake r8169 KCFG="-versatile" -# ipfiremake r8168 KCFG="-versatile" -# ipfiremake r8101 KCFG="-versatile" - ipfiremake e1000 KCFG="-versatile" - ipfiremake e1000e KCFG="-versatile" - ipfiremake igb KCFG="-versatile" +# ipfiremake r8169 KCFG="-versatile" +# ipfiremake r8168 KCFG="-versatile" +# ipfiremake r8101 KCFG="-versatile" +# ipfiremake e1000 KCFG="-versatile" +# ipfiremake e1000e KCFG="-versatile" +# ipfiremake igb KCFG="-versatile" # arm-kirkwood kernel build ipfiremake linux KCFG="-kirkwood" - ipfiremake v4l-dvb KCFG="-kirkwood" - ipfiremake kqemu KCFG="-kirkwood" - ipfiremake kvm-kmod KCFG="-kirkwood" - ipfiremake madwifi KCFG="-kirkwood" - ipfiremake mISDN KCFG="-kirkwood" - ipfiremake dahdi KCFG="-kirkwood" KMOD=1 +# ipfiremake v4l-dvb KCFG="-kirkwood" +# ipfiremake kvm-kmod KCFG="-kirkwood" +# ipfiremake mISDN KCFG="-kirkwood" +# ipfiremake dahdi KCFG="-kirkwood" KMOD=1 ipfiremake cryptodev KCFG="-kirkwood" ipfiremake compat-wireless KCFG="-kirkwood" -# ipfiremake r8169 KCFG="-kirkwood" -# ipfiremake r8168 KCFG="-kirkwood" -# ipfiremake r8101 KCFG="-kirkwood" - ipfiremake e1000 KCFG="-kirkwood" - ipfiremake e1000e KCFG="-kirkwood" - ipfiremake igb KCFG="-kirkwood" +# ipfiremake r8169 KCFG="-kirkwood" +# ipfiremake r8168 KCFG="-kirkwood" +# ipfiremake r8101 KCFG="-kirkwood" +# ipfiremake e1000 KCFG="-kirkwood" +# ipfiremake e1000e KCFG="-kirkwood" +# ipfiremake igb KCFG="-kirkwood" fi ipfiremake pkg-config ipfiremake linux-atm @@ -551,6 +586,8 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser + ipfiremake Crypt-PasswdMD5 + ipfiremake Net-Telnet ipfiremake python-setuptools ipfiremake python-clientform ipfiremake python-mechanize @@ -576,7 +613,6 @@ buildipfire() { ipfiremake traceroute ipfiremake vlan ipfiremake wireless - ipfiremake libsafe ipfiremake pakfire ipfiremake spandsp ipfiremake lzo @@ -592,10 +628,9 @@ buildipfire() { ipfiremake wget ipfiremake bridge-utils ipfiremake screen - ipfiremake hddtemp ipfiremake smartmontools ipfiremake htop - ipfiremake postfix +# ipfiremake postfix # unknown system type linux 3.2.x ipfiremake fetchmail ipfiremake cyrus-imapd ipfiremake openmailadmin @@ -649,7 +684,6 @@ buildipfire() { ipfiremake fbset ipfiremake sdl ipfiremake qemu - ipfiremake qemu-kqemu ipfiremake sane ipfiremake netpbm ipfiremake phpSANE @@ -713,9 +747,9 @@ buildipfire() { ipfiremake nut ipfiremake watchdog ipfiremake libpri - ipfiremake dahdi - ipfiremake asterisk - ipfiremake lcr +# ipfiremake dahdi # update needed for 3.2.x +# ipfiremake asterisk +# ipfiremake lcr ipfiremake usb_modeswitch ipfiremake usb_modeswitch_data ipfiremake zerofree @@ -725,7 +759,7 @@ buildipfire() { ipfiremake minicom ipfiremake ddrescue ipfiremake imspector - ipfiremake miniupnpd +# ipfiremake miniupnpd # will not build ipfiremake client175 ipfiremake powertop ipfiremake parted @@ -743,6 +777,8 @@ buildipfire() { ipfiremake transmission ipfiremake dpfhack ipfiremake lcd4linux + ipfiremake mtr + ipfiremake tcpick echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -982,6 +1018,7 @@ downloadsrc) ERROR=0 for i in *; do if [ -f "$i" -a "$i" != "Config" ]; then + lfsmakecommoncheck ${i} > /dev/null || continue make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \ MESSAGE="$i\t " md5 >> $LOGFILE 2>&1 if [ $? -ne 0 ]; then