X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=2bf61bac204666a84563b670be5141048489d10b;hb=8bec7790904905339ec70cb41ec3b56ce31b3349;hp=f425428ec6d5c3b6b2feed0294c7f5d407a999aa;hpb=6acda73be0ef6c20182a9eb85904a2df3613e9c3;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index f425428ec6..2bf61bac20 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="57" # Core Level (Filename) -PAKFIRE_CORE="56" # 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=3 +TOOLCHAINVER=4 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -222,7 +222,7 @@ 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 @@ -240,7 +240,7 @@ buildtoolchain() { ;; # ARM - armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l) + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l) # These are working. ;; armv5tel:*) @@ -255,6 +255,14 @@ buildtoolchain() { exiterror "Cannot build toolchain on ipfire. Please use the download." fi + if [ ! -e /usr/include/asm -o ! -e /usr/include/bits -o ! -e /usr/include/gnu -o ! -e /usr/include/sys ]; then + exiterror "Cannot build toolchain without (asm, bits, gnu or sys includes). Please fix or use the download." + fi + + if [ ! -e /usr/lib/libc.so ]; then + exiterror "Cannot build toolchain without (/usr/lib/libc.so). Please fix or use the download." + fi + LOGFILE="$BASEDIR/log/_build.toolchain.log" export LOGFILE NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` @@ -262,14 +270,10 @@ buildtoolchain() { ORG_PATH=$PATH lfsmake1 ccache PASS=1 lfsmake1 make PASS=1 + lfsmake1 linux2 TOOLS=1 HEADERS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH - if [ "${MACHINE_TYPE}" = "arm" ]; then - lfsmake1 linux TOOLS=1 HEADERS=1 - else - lfsmake1 linux-libc-header - fi lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 lfsmake1 fake-environ @@ -306,11 +310,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 @@ -384,90 +384,99 @@ 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-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 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" + # 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-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 @@ -572,6 +581,7 @@ buildipfire() { ipfiremake Locale-Country ipfiremake XML-Parser ipfiremake Crypt-PasswdMD5 + ipfiremake Net-Telnet ipfiremake python-setuptools ipfiremake python-clientform ipfiremake python-mechanize @@ -616,7 +626,7 @@ buildipfire() { ipfiremake hddtemp ipfiremake smartmontools ipfiremake htop - ipfiremake postfix +# ipfiremake postfix # unknown system type linux 3.2.x ipfiremake fetchmail ipfiremake cyrus-imapd ipfiremake openmailadmin @@ -670,7 +680,6 @@ buildipfire() { ipfiremake fbset ipfiremake sdl ipfiremake qemu - ipfiremake qemu-kqemu ipfiremake sane ipfiremake netpbm ipfiremake phpSANE @@ -734,9 +743,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 @@ -746,7 +755,7 @@ buildipfire() { ipfiremake minicom ipfiremake ddrescue ipfiremake imspector - ipfiremake miniupnpd +# ipfiremake miniupnpd # will not build ipfiremake client175 ipfiremake powertop ipfiremake parted @@ -764,6 +773,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