X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=1679d3293a9f07fde8592187e3a2722809e6a084;hp=1fdf510975e7e7b95ab664878fbce4a1be561b90;hb=9f86ef66a0fdd1a277eb6e3f74b0cc5eb9c4b94a;hpb=a3c495ee7047610e281bf47882c9d3ecd52159a8 diff --git a/make.sh b/make.sh index 1fdf510975..1679d3293a 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.9" # Version number -CORE="52" # Core Level (Filename) -PAKFIRE_CORE="51" # Core Level (PAKFIRE) +VERSION="2.11" # Version number +CORE="53" # Core Level (Filename) +PAKFIRE_CORE="52" # 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 @@ -286,6 +286,7 @@ buildtoolchain() { lfsmake1 tar lfsmake1 texinfo lfsmake1 util-linux + lfsmake1 strip lfsmake1 cleanup-toolchain PASS=2 export PATH=$ORG_PATH } @@ -352,11 +353,7 @@ buildbase() { lfsmake2 udev lfsmake2 util-linux lfsmake2 vim - - # ARM cannot use grub. - if [ "${MACHINE_TYPE}" != "arm" ]; then - lfsmake2 grub - fi + lfsmake2 grub } buildipfire() { @@ -375,6 +372,7 @@ buildipfire() { ipfiremake xz ipfiremake linux-firmware ipfiremake zd1211-firmware + ipfiremake u-boot # The xen and PAE kernels are only available for x86 if [ "${MACHINE_TYPE}" != "arm" ]; then @@ -413,27 +411,24 @@ buildipfire() { # Default kernel build ipfiremake linux ipfiremake v4l-dvb - - if [ "${MACHINE_TYPE}" != "arm" ]; then - # Virtualization helpers are only available for x86. - ipfiremake kqemu - ipfiremake kvm-kmod - #unsupported arch (armv5) - ipfiremake madwifi + ipfiremake kqemu + ipfiremake kvm-kmod + ipfiremake madwifi + if [ "${MACHINE_TYPE}" = "arm" ]; then #todo enable alsa driver in kernel config ipfiremake alsa KMOD=1 - #undefined declaration in echo canceler try to fix later - ipfiremake mISDN fi + #undefined declaration in echo canceler try to fix later + ipfiremake mISDN ipfiremake dahdi KMOD=1 ipfiremake cryptodev ipfiremake compat-wireless # ipfiremake r8169 # ipfiremake r8168 # ipfiremake r8101 - #ipfiremake e1000 - #ipfiremake e1000e - #ipfiremake igb + ipfiremake e1000 + ipfiremake e1000e + ipfiremake igb ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio @@ -478,7 +473,7 @@ buildipfire() { ipfiremake arping ipfiremake beep ipfiremake bind - ipfiremake cdrtools + ipfiremake dvdrtools ipfiremake dnsmasq ipfiremake dosfstools ipfiremake reiserfsprogs @@ -563,7 +558,6 @@ buildipfire() { ipfiremake wireless ipfiremake libsafe ipfiremake pakfire - ipfiremake java ipfiremake spandsp ipfiremake lzo ipfiremake openvpn @@ -611,6 +605,7 @@ buildipfire() { ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent + ipfiremake libevent2 ipfiremake portmap ipfiremake nfs ipfiremake nmap @@ -634,8 +629,8 @@ buildipfire() { ipfiremake igmpproxy ipfiremake fbset ipfiremake sdl - #ipfiremake qemu - #ipfiremake qemu-kqemu + ipfiremake qemu + ipfiremake qemu-kqemu ipfiremake sane ipfiremake netpbm ipfiremake phpSANE @@ -650,7 +645,7 @@ buildipfire() { ipfiremake faad2 ipfiremake ffmpeg ipfiremake videolan - #ipfiremake vdr + ipfiremake vdr ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator @@ -666,11 +661,9 @@ buildipfire() { ipfiremake wpa_supplicant ipfiremake hostapd ipfiremake urlgrabber - if [ "${MACHINE_TYPE}" != "arm" ]; then - ipfiremake syslinux - fi + ipfiremake syslinux ipfiremake tftpd - #ipfiremake cpufrequtils + ipfiremake cpufrequtils ipfiremake dbus ipfiremake bluetooth ipfiremake gutenprint @@ -693,9 +686,7 @@ buildipfire() { ipfiremake perl-DBD-mysql ipfiremake cacti ipfiremake icecc - if [ "${MACHINE_TYPE}" != "arm" ]; then - ipfiremake openvmtools - fi + ipfiremake openvmtools ipfiremake nagiosql ipfiremake iftop ipfiremake motion @@ -704,8 +695,8 @@ buildipfire() { ipfiremake watchdog ipfiremake libpri ipfiremake dahdi - #ipfiremake asterisk - #ipfiremake lcr + ipfiremake asterisk + ipfiremake lcr ipfiremake usb_modeswitch ipfiremake usb_modeswitch_data ipfiremake zerofree @@ -723,14 +714,14 @@ buildipfire() { ipfiremake python-m2crypto ipfiremake wireless-regdb ipfiremake crda - ipfiremake libsatsolver - ipfiremake python-satsolver + ipfiremake libsolv ipfiremake python-distutils-extra ipfiremake python-lzma ipfiremake python-progressbar ipfiremake python-xattr ipfiremake intltool ipfiremake pakfire3-deps + ipfiremake transmission echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -740,7 +731,7 @@ 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" ]; then + if [ "$GIT_BRANCH" = "next" ]; then echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release else echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release @@ -751,11 +742,9 @@ buildinstaller() { # Run installer scripts one by one LOGFILE="$BASEDIR/log/_build.installer.log" export LOGFILE - if [ "${MACHINE_TYPE}" != "arm" ]; then - ipfiremake as86 - ipfiremake mbr - ipfiremake memtest - fi + ipfiremake as86 + ipfiremake mbr + ipfiremake memtest ipfiremake installer cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/ installmake strip @@ -788,11 +777,13 @@ buildpackages() { $0 git log # Create images for install - ipfiremake cdrom ED=$IPFVER + ipfiremake cdrom ED=$IPFVER # Check if there is a loop device for building in virtual environments - if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then - ipfiremake usb-stick ED=$IPFVER + if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then + if [ "${MACHINE_TYPE}" != "arm" ]; then + ipfiremake usb-stick ED=$IPFVER + fi ipfiremake flash-images ED=$IPFVER fi @@ -855,7 +846,7 @@ ipfirepackages() { case "$1" in build) clear - PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1` + PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz 2> /dev/null | head -n 1` #only restore on a clean disk if [ ! -f log/cleanup-toolchain-2-tools ]; then if [ ! -n "$PACKAGE" ]; then @@ -946,7 +937,8 @@ downloadsrc) cd $BASEDIR/lfs for i in *; do if [ -f "$i" -a "$i" != "Config" ]; then - echo -ne "Loading $i" + lfsmakecommoncheck ${i} || continue + make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \ MESSAGE="$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1 if [ $? -ne 0 ]; then @@ -987,27 +979,27 @@ toolchain) prepareenv beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`" buildtoolchain - echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE + echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE 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 \ + cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \ build/{bin,etc,usr/bin,usr/local} \ build/tools/{bin,etc,*-linux-gnu*,include,lib,libexec,sbin,share,var} \ log >> $LOGFILE - md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \ - > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.md5 + md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \ + > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5 stdumount ;; gettoolchain) # arbitrary name to be updated in case of new toolchain package upload - PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE + PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE 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 -p $BASEDIR/cache/toolchains - echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE + echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $MACHINE" | tee -a $LOGFILE cd $BASEDIR/cache/toolchains wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null if [ $? -ne 0 ]; then - echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE + echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $MACHINE machine" | tee -a $LOGFILE else if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE