X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=55684d5742aaa0011feaed6e3e160378f9ddecb1;hp=ab6640ebc9aa76b5f5f927c891108a096f7a8dd2;hb=534fb55f9d0a212c5d857eb3eccabe5c08df1ba1;hpb=28d70963708626d1248262a9a84626b0d8fbb483 diff --git a/make.sh b/make.sh index ab6640ebc..55684d574 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="64" # 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 @@ -37,12 +37,11 @@ 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=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:*) @@ -240,7 +234,7 @@ buildtoolchain() { ;; # ARM - armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l) + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l) # These are working. ;; armv5tel:*) @@ -251,8 +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." + 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" @@ -260,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 @@ -269,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 @@ -291,6 +284,8 @@ buildtoolchain() { lfsmake1 sed lfsmake1 tar lfsmake1 texinfo + lfsmake1 xz + lfsmake1 fake-environ lfsmake1 cleanup-toolchain PASS=2 export PATH=$ORG_PATH } @@ -322,6 +317,9 @@ buildbase() { lfsmake2 libtool lfsmake2 perl lfsmake2 readline + lfsmake2 readline-compat + lfsmake2 pcre + lfsmake2 pcre-compat lfsmake2 autoconf lfsmake2 automake lfsmake2 bash @@ -340,7 +338,6 @@ buildbase() { lfsmake2 iproute2 lfsmake2 kbd lfsmake2 less - lfsmake2 libaal lfsmake2 make lfsmake2 man lfsmake2 mktemp @@ -348,7 +345,6 @@ buildbase() { lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc - lfsmake2 reiser4progs lfsmake2 shadow lfsmake2 sysklogd lfsmake2 sysvinit @@ -357,6 +353,7 @@ buildbase() { lfsmake2 udev lfsmake2 util-linux lfsmake2 vim + lfsmake2 xz lfsmake2 grub } @@ -365,6 +362,7 @@ buildipfire() { export LOGFILE ipfiremake configroot ipfiremake backup + ipfiremake bind ipfiremake dhcp ipfiremake dhcpcd ipfiremake libusb @@ -373,116 +371,82 @@ buildipfire() { ipfiremake pptp ipfiremake unzip ipfiremake which - ipfiremake xz ipfiremake linux-firmware + ipfiremake dvb-firmwares 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 + + # x86-xen (Legacy XEN) kernel build 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" -# 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" + + # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG="-pae" -# ipfiremake kvm-kmod KCFG="-pae" -# ipfiremake v4l-dvb 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 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 r8169 KCFG="-pae" + ipfiremake r8168 KCFG="-pae" + ipfiremake r8101 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 kvm-kmod 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="" -# ipfiremake r8168 KCFG="" -# ipfiremake r8101 KCFG="" -# ipfiremake e1000 KCFG="" -# ipfiremake e1000e KCFG="" -# ipfiremake igb KCFG="" + ipfiremake r8169 KCFG="" + ipfiremake r8168 KCFG="" + ipfiremake r8101 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 dahdi KCFG="-rpi" KMOD=1 + 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 compat-wireless KCFG="-rpi" + # arm-omap (Panda Board) kernel build 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 v4l-dvb KCFG="-omap" + ipfiremake mISDN KCFG="-omap" NOPCI=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 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" - # arm-kirkwood kernel build + ipfiremake compat-wireless KCFG="-omap" + + # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" -# ipfiremake v4l-dvb KCFG="-kirkwood" -# ipfiremake kvm-kmod KCFG="-kirkwood" -# ipfiremake mISDN KCFG="-kirkwood" -# ipfiremake dahdi KCFG="-kirkwood" KMOD=1 + ipfiremake v4l-dvb KCFG="-kirkwood" + ipfiremake mISDN KCFG="-kirkwood" 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 e1000e KCFG="-kirkwood" + ipfiremake igb KCFG="-kirkwood" + fi ipfiremake pkg-config ipfiremake linux-atm @@ -501,6 +465,7 @@ buildipfire() { ipfiremake libnl ipfiremake libidn ipfiremake libjpeg + ipfiremake libexif ipfiremake libpng ipfiremake libtiff ipfiremake libart @@ -526,7 +491,6 @@ buildipfire() { ipfiremake apache2 PASS=C ipfiremake arping ipfiremake beep - ipfiremake bind ipfiremake dvdrtools ipfiremake dnsmasq ipfiremake dosfstools @@ -550,13 +514,11 @@ buildipfire() { ipfiremake iptables ipfiremake libupnp ipfiremake ipaddr - ipfiremake iptstate ipfiremake iputils ipfiremake l7-protocols ipfiremake mISDNuser ipfiremake capi4k-utils ipfiremake hwdata - ipfiremake kudzu ipfiremake logrotate ipfiremake logwatch ipfiremake misc-progs @@ -592,12 +554,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 @@ -629,7 +598,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 @@ -644,6 +613,7 @@ buildipfire() { ipfiremake libogg ipfiremake libvorbis ipfiremake libdvbpsi + ipfiremake flac ipfiremake lame ipfiremake sox ipfiremake libshout @@ -652,7 +622,6 @@ buildipfire() { ipfiremake cmake ipfiremake gnump3d ipfiremake libsigc++ - ipfiremake applejuice ipfiremake libtorrent ipfiremake rtorrent ipfiremake ipfireseeder @@ -671,7 +640,6 @@ buildipfire() { ipfiremake vsftpd ipfiremake strongswan ipfiremake lsof - ipfiremake centerim ipfiremake br2684ctl ipfiremake pcmciautils ipfiremake lm_sensors @@ -690,8 +658,6 @@ buildipfire() { ipfiremake nagios ipfiremake nagios_nrpe ipfiremake ebtables - ipfiremake fontconfig - ipfiremake freefont ipfiremake directfb ipfiremake dfb++ ipfiremake faad2 @@ -712,6 +678,7 @@ buildipfire() { ipfiremake iw ipfiremake wpa_supplicant ipfiremake hostapd + ipfiremake pycurl ipfiremake urlgrabber ipfiremake syslinux ipfiremake tftpd @@ -724,7 +691,6 @@ buildipfire() { ipfiremake netcat ipfiremake 7zip ipfiremake lynis - ipfiremake splix ipfiremake streamripper ipfiremake sshfs ipfiremake taglib @@ -746,9 +712,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 @@ -758,7 +723,7 @@ buildipfire() { ipfiremake minicom ipfiremake ddrescue ipfiremake imspector -# ipfiremake miniupnpd # will not build + ipfiremake miniupnpd ipfiremake client175 ipfiremake powertop ipfiremake parted @@ -772,12 +737,20 @@ buildipfire() { ipfiremake python-progressbar ipfiremake python-xattr ipfiremake intltool - ipfiremake pakfire3-deps ipfiremake transmission ipfiremake dpfhack ipfiremake lcd4linux ipfiremake mtr ipfiremake tcpick + ipfiremake minidlna + ipfiremake acpid + ipfiremake fping + ipfiremake telnet + ipfiremake libgpg-error + ipfiremake libassuan + ipfiremake gpgme + ipfiremake pygpgme + ipfiremake pakfire3 echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -787,11 +760,14 @@ 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 - else - echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release - fi + case "$GIT_BRANCH" in + core*) + echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release + ;; + *) + echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release + ;; + esac } buildinstaller() { @@ -852,6 +828,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 @@ -888,7 +866,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 @@ -1043,7 +1021,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