X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=2a71bbfb73fb5ea453957abdfd4e950589fa2466;hb=d9edbc1be44beeb38a64702427867f8e6311d09d;hp=b250ee69a760876d920eb058256aefd11109b30f;hpb=db95c207362bbf475c4756f1f3b352cabe75c5e8;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index b250ee69a..2a71bbfb7 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.11" # Version number -CORE="62" # Core Level (Filename) -PAKFIRE_CORE="61" # Core Level (PAKFIRE) +VERSION="2.13" # Version number +CORE="63" # Core Level (Filename) +PAKFIRE_CORE="63" # 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 @@ -42,7 +42,6 @@ TOOLCHAINVER=5 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then BUILDMACHINE="i686"; - linux32="linux32"; fi @@ -214,11 +213,6 @@ prepareenv() { mount --bind $BASEDIR/log $BASEDIR/build/usr/src/log mount --bind $BASEDIR/src $BASEDIR/build/usr/src/src - # This is a temporary hack!!! - if [ ! -f /tools/bin/hostname ]; then - cp -f /bin/hostname /tools/bin/hostname 2>/dev/null - fi - # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache export CCACHE_COMPRESS=1 @@ -232,7 +226,7 @@ buildtoolchain() { local error=false case "${MACHINE}:$(uname -m)" in # x86 - i586:i586|i586:i686) + i586:i586|i586:i686|i586:x86_64) # These are working. ;; i586:*) @@ -251,16 +245,9 @@ buildtoolchain() { ${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 - - 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." + local gcc=$(type -p gcc) + if [ -z "${gcc}" ]; then + exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain." fi LOGFILE="$BASEDIR/log/_build.toolchain.log" @@ -268,7 +255,6 @@ buildtoolchain() { local ORG_PATH=$PATH export PATH="/tools/ccache/bin:/tools/bin:$PATH" - lfsmake1 fake-environ PASS=1 lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 @@ -277,7 +263,6 @@ buildtoolchain() { lfsmake1 cleanup-toolchain PASS=1 lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 - lfsmake1 fake-environ PASS=2 lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect @@ -299,6 +284,8 @@ buildtoolchain() { lfsmake1 sed lfsmake1 tar lfsmake1 texinfo + lfsmake1 xz + lfsmake1 fake-environ lfsmake1 cleanup-toolchain PASS=2 export PATH=$ORG_PATH } @@ -330,6 +317,9 @@ buildbase() { lfsmake2 libtool lfsmake2 perl lfsmake2 readline + lfsmake2 readline-compat + lfsmake2 pcre + lfsmake2 pcre-compat lfsmake2 autoconf lfsmake2 automake lfsmake2 bash @@ -348,7 +338,6 @@ buildbase() { lfsmake2 iproute2 lfsmake2 kbd lfsmake2 less - lfsmake2 libaal lfsmake2 make lfsmake2 man lfsmake2 mktemp @@ -356,7 +345,6 @@ buildbase() { lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc - lfsmake2 reiser4progs lfsmake2 shadow lfsmake2 sysklogd lfsmake2 sysvinit @@ -365,6 +353,7 @@ buildbase() { lfsmake2 udev lfsmake2 util-linux lfsmake2 vim + lfsmake2 xz lfsmake2 grub } @@ -373,6 +362,7 @@ buildipfire() { export LOGFILE ipfiremake configroot ipfiremake backup + ipfiremake bind ipfiremake dhcp ipfiremake dhcpcd ipfiremake libusb @@ -381,19 +371,16 @@ buildipfire() { ipfiremake pptp ipfiremake unzip ipfiremake which - 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 linux2 KCFG="-xen" -# ipfiremake v4l-dvb KCFG="-xen" -# ipfiremake mISDN KCFG="-xen" -# ipfiremake dahdi KCFG="-xen" KMOD=1 + ipfiremake v4l-dvb KCFG="-xen" + ipfiremake mISDN KCFG="-xen" ipfiremake cryptodev KCFG="-xen" ipfiremake compat-wireless KCFG="-xen" # ipfiremake r8169 KCFG="-xen" @@ -405,10 +392,9 @@ buildipfire() { ipfiremake linux KCFG="-pae" # ipfiremake kvm-kmod KCFG="-pae" -# ipfiremake v4l-dvb 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 cryptodev KCFG="-pae" ipfiremake compat-wireless KCFG="-pae" # ipfiremake r8169 KCFG="-pae" @@ -420,10 +406,9 @@ buildipfire() { ipfiremake linux KCFG="" # ipfiremake kvm-kmod KCFG="" -# ipfiremake v4l-dvb KCFG="" + ipfiremake v4l-dvb KCFG="" ipfiremake alsa KCFG="" KMOD=1 -# ipfiremake mISDN KCFG="" -# ipfiremake dahdi KCFG="" KMOD=1 + ipfiremake mISDN KCFG="" ipfiremake cryptodev KCFG="" ipfiremake compat-wireless KCFG="" # ipfiremake r8169 KCFG="" @@ -436,10 +421,9 @@ buildipfire() { else # arm-omap kernel build ipfiremake linux KCFG="-rpi" -# ipfiremake v4l-dvb KCFG="-rpi" + ipfiremake v4l-dvb KCFG="-rpi" # ipfiremake kvm-kmod KCFG="-rpi" -# ipfiremake mISDN KCFG="-rpi" -# ipfiremake dahdi KCFG="-rpi" KMOD=1 + ipfiremake mISDN KCFG="-rpi" NOPCI=1 ipfiremake cryptodev KCFG="-rpi" ipfiremake compat-wireless KCFG="-rpi" # ipfiremake r8169 KCFG="-rpi" @@ -450,10 +434,9 @@ buildipfire() { # ipfiremake igb KCFG="-rpi" ipfiremake linux KCFG="-omap" -# ipfiremake v4l-dvb KCFG="-omap" + ipfiremake v4l-dvb KCFG="-omap" # ipfiremake kvm-kmod KCFG="-omap" -# ipfiremake mISDN KCFG="-omap" -# ipfiremake dahdi KCFG="-omap" KMOD=1 + ipfiremake mISDN KCFG="-omap" NOPCI=1 ipfiremake cryptodev KCFG="-omap" ipfiremake compat-wireless KCFG="-omap" # ipfiremake r8169 KCFG="-omap" @@ -465,10 +448,9 @@ buildipfire() { # arm-kirkwood kernel build ipfiremake linux KCFG="-kirkwood" -# ipfiremake v4l-dvb KCFG="-kirkwood" + ipfiremake v4l-dvb KCFG="-kirkwood" # ipfiremake kvm-kmod KCFG="-kirkwood" -# ipfiremake mISDN KCFG="-kirkwood" -# ipfiremake dahdi KCFG="-kirkwood" KMOD=1 + ipfiremake mISDN KCFG="-kirkwood" ipfiremake cryptodev KCFG="-kirkwood" ipfiremake compat-wireless KCFG="-kirkwood" # ipfiremake r8169 KCFG="-kirkwood" @@ -477,6 +459,7 @@ buildipfire() { # ipfiremake e1000 KCFG="-kirkwood" # ipfiremake e1000e KCFG="-kirkwood" # ipfiremake igb KCFG="-kirkwood" + fi ipfiremake pkg-config ipfiremake linux-atm @@ -495,6 +478,7 @@ buildipfire() { ipfiremake libnl ipfiremake libidn ipfiremake libjpeg + ipfiremake libexif ipfiremake libpng ipfiremake libtiff ipfiremake libart @@ -520,7 +504,6 @@ buildipfire() { ipfiremake apache2 PASS=C ipfiremake arping ipfiremake beep - ipfiremake bind ipfiremake dvdrtools ipfiremake dnsmasq ipfiremake dosfstools @@ -544,7 +527,6 @@ buildipfire() { ipfiremake iptables ipfiremake libupnp ipfiremake ipaddr - ipfiremake iptstate ipfiremake iputils ipfiremake l7-protocols ipfiremake mISDNuser @@ -586,12 +568,19 @@ buildipfire() { ipfiremake python-mechanize ipfiremake python-feedparser ipfiremake python-rssdler + ipfiremake libffi ipfiremake glib ipfiremake GeoIP ipfiremake fwhits ipfiremake noip_updater ipfiremake ntp ipfiremake openssh + ipfiremake fontconfig + ipfiremake dejavu-fonts-ttf + ipfiremake freefont + ipfiremake pixman + ipfiremake cairo + ipfiremake pango ipfiremake rrdtool ipfiremake setserial ipfiremake setup @@ -623,7 +612,7 @@ buildipfire() { ipfiremake screen ipfiremake smartmontools ipfiremake htop -# ipfiremake postfix # unknown system type linux 3.2.x + ipfiremake postfix ipfiremake fetchmail ipfiremake cyrus-imapd ipfiremake openmailadmin @@ -638,6 +627,7 @@ buildipfire() { ipfiremake libogg ipfiremake libvorbis ipfiremake libdvbpsi + ipfiremake flac ipfiremake lame ipfiremake sox ipfiremake libshout @@ -646,7 +636,6 @@ buildipfire() { ipfiremake cmake ipfiremake gnump3d ipfiremake libsigc++ - ipfiremake applejuice ipfiremake libtorrent ipfiremake rtorrent ipfiremake ipfireseeder @@ -665,7 +654,6 @@ buildipfire() { ipfiremake vsftpd ipfiremake strongswan ipfiremake lsof - ipfiremake centerim ipfiremake br2684ctl ipfiremake pcmciautils ipfiremake lm_sensors @@ -684,8 +672,6 @@ buildipfire() { ipfiremake nagios ipfiremake nagios_nrpe ipfiremake ebtables - ipfiremake fontconfig - ipfiremake freefont ipfiremake directfb ipfiremake dfb++ ipfiremake faad2 @@ -706,6 +692,7 @@ buildipfire() { ipfiremake iw ipfiremake wpa_supplicant ipfiremake hostapd + ipfiremake pycurl ipfiremake urlgrabber ipfiremake syslinux ipfiremake tftpd @@ -718,7 +705,6 @@ buildipfire() { ipfiremake netcat ipfiremake 7zip ipfiremake lynis - ipfiremake splix ipfiremake streamripper ipfiremake sshfs ipfiremake taglib @@ -740,9 +726,8 @@ buildipfire() { ipfiremake nut ipfiremake watchdog ipfiremake libpri -# ipfiremake dahdi # update needed for 3.2.x -# ipfiremake asterisk -# ipfiremake lcr + ipfiremake asterisk + ipfiremake lcr ipfiremake usb_modeswitch ipfiremake usb_modeswitch_data ipfiremake zerofree @@ -752,7 +737,7 @@ buildipfire() { ipfiremake minicom ipfiremake ddrescue ipfiremake imspector -# ipfiremake miniupnpd # will not build + ipfiremake miniupnpd ipfiremake client175 ipfiremake powertop ipfiremake parted @@ -772,6 +757,14 @@ buildipfire() { ipfiremake lcd4linux ipfiremake mtr ipfiremake tcpick + ipfiremake minidlna + ipfiremake acpid + ipfiremake fping + ipfiremake telnet + ipfiremake libgpg-error + ipfiremake libassuan + ipfiremake gpgme + ipfiremake pygpgme echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -846,6 +839,8 @@ buildpackages() { 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/ + cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/ + cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/ ipfiremake xen-image rm -rf $LFS/install/packages/linux-xen-*.ipfire rm -rf $LFS/install/packages/meta-linux-xen @@ -1037,7 +1032,7 @@ toolchain) 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-$MACHINE.tar.gz \ - build/tools log >> $LOGFILE + build/tools build/bin/sh log >> $LOGFILE md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \ > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5 stdumount