X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=4032fc2d5c15ef918bbc4d71b05cdbd15c48c5b6;hb=afd6e1931defb60665b40438d8e54db6de46246f;hp=a91b2da7cf7061be2a8aadb10dbe1ee87db8bf60;hpb=e41fbb6f0d47b0468f7c3ed2f7dbcae2d8bc9c4b;p=ipfire-2.x.git diff --git a/make.sh b/make.sh index a91b2da7cf..4032fc2d5c 100755 --- a/make.sh +++ b/make.sh @@ -17,16 +17,16 @@ # 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-2014 IPFire Team . # +# Copyright (C) 2007-2015 IPFire Team . # # # ############################################################################ # NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.15" # Version number -CORE="85" # Core Level (Filename) -PAKFIRE_CORE="85" # Core Level (PAKFIRE) +VERSION="2.17" # Version number +CORE="94" # Core Level (Filename) +PAKFIRE_CORE="93" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -36,7 +36,7 @@ BUILD_IMAGES=1 # Flash and Xen Downloader KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=7 +TOOLCHAINVER=9 # New architecture variables BUILD_ARCH="$(uname -m)" @@ -383,8 +383,9 @@ buildipfire() { export LOGFILE ipfiremake configroot ipfiremake backup + ipfiremake pkg-config ipfiremake libusb - ipfiremake libusbx + ipfiremake libusb-compat ipfiremake libpcap ipfiremake ppp ipfiremake pptp @@ -403,66 +404,69 @@ buildipfire() { ipfiremake multipath-tools ipfiremake freetype ipfiremake grub + ipfiremake libmnl + ipfiremake libnfnetlink + ipfiremake libnetfilter_queue + ipfiremake libnetfilter_conntrack + ipfiremake libnetfilter_cthelper + ipfiremake libnetfilter_cttimeout + ipfiremake iptables case "${TARGET_ARCH}" in i586) # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG="-pae" -# ipfiremake kvm-kmod KCFG="-pae" -# ipfiremake v4l-dvb KCFG="-pae" -# ipfiremake mISDN KCFG="-pae" + ipfiremake backports KCFG="-pae" ipfiremake cryptodev KCFG="-pae" -# ipfiremake compat-drivers KCFG="-pae" -# ipfiremake r8169 KCFG="-pae" -# ipfiremake r8168 KCFG="-pae" -# ipfiremake r8101 KCFG="-pae" ipfiremake e1000e KCFG="-pae" - ipfiremake igb KCFG="-pae" +# ipfiremake igb KCFG="-pae" + ipfiremake ixgbe KCFG="-pae" + ipfiremake xtables-addons KCFG="-pae" + ipfiremake linux-initrd KCFG="-pae" # x86 kernel build ipfiremake linux KCFG="" -# ipfiremake kvm-kmod KCFG="" -# ipfiremake v4l-dvb KCFG="" -# ipfiremake mISDN KCFG="" + ipfiremake backports KCFG="" ipfiremake cryptodev KCFG="" -# ipfiremake compat-drivers KCFG="" -# ipfiremake r8169 KCFG="" -# ipfiremake r8168 KCFG="" -# ipfiremake r8101 KCFG="" ipfiremake e1000e KCFG="" - ipfiremake igb KCFG="" +# ipfiremake igb KCFG="" + ipfiremake ixgbe KCFG="" + ipfiremake xtables-addons KCFG="" + ipfiremake linux-initrd KCFG="" ;; armv5tel) # arm-rpi (Raspberry Pi) kernel build ipfiremake linux KCFG="-rpi" -# ipfiremake v4l-dvb KCFG="-rpi" -# ipfiremake mISDN KCFG="-rpi" NOPCI=1 + ipfiremake backports KCFG="-rpi" ipfiremake cryptodev KCFG="-rpi" -# ipfiremake compat-drivers KCFG="-rpi" + ipfiremake xtables-addons KCFG="-rpi" + ipfiremake linux-initrd KCFG="-rpi" # arm multi platform (Panda, Wandboard ...) kernel build ipfiremake linux KCFG="-multi" + ipfiremake backports KCFG="-multi" ipfiremake cryptodev KCFG="-multi" ipfiremake e1000e KCFG="-multi" - ipfiremake igb KCFG="-multi" +# ipfiremake igb KCFG="-multi" + ipfiremake ixgbe KCFG="-multi" + ipfiremake xtables-addons KCFG="-multi" + ipfiremake linux-initrd KCFG="-multi" # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" -# ipfiremake v4l-dvb KCFG="-kirkwood" -# ipfiremake mISDN KCFG="-kirkwood" + ipfiremake backports KCFG="-kirkwood" ipfiremake cryptodev KCFG="-kirkwood" -# ipfiremake compat-drivers KCFG="-kirkwood" -# ipfiremake r8169 KCFG="-kirkwood" -# ipfiremake r8168 KCFG="-kirkwood" -# ipfiremake r8101 KCFG="-kirkwood" -# ipfiremake e1000e KCFG="-kirkwood" - ipfiremake igb KCFG="-kirkwood" + ipfiremake e1000e KCFG="-kirkwood" +# ipfiremake igb KCFG="-kirkwood" + ipfiremake ixgbe KCFG="-kirkwood" + ipfiremake xtables-addons KCFG="-kirkwood" + ipfiremake linux-initrd KCFG="-kirkwood" ;; esac - ipfiremake pkg-config + ipfiremake xtables-addons USPACE="1" ipfiremake openssl - ipfiremake openssl-compat + [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl KCFG='-sse2' ipfiremake libgpg-error ipfiremake libgcrypt ipfiremake libassuan @@ -477,7 +481,9 @@ buildipfire() { ipfiremake curl ipfiremake tcl ipfiremake sqlite + ipfiremake libffi ipfiremake python + ipfiremake ca-certificates ipfiremake fireinfo ipfiremake libnet ipfiremake libnl @@ -508,7 +514,8 @@ buildipfire() { ipfiremake openldap ipfiremake apache2 ipfiremake php - ipfiremake apache2 PASS=C + ipfiremake web-user-interface + ipfiremake flag-icons ipfiremake jquery ipfiremake arping ipfiremake beep @@ -535,8 +542,6 @@ buildipfire() { ipfiremake mtools ipfiremake initscripts ipfiremake whatmask - ipfiremake libmnl - ipfiremake iptables ipfiremake conntrack-tools ipfiremake libupnp ipfiremake ipaddr @@ -581,7 +586,6 @@ buildipfire() { ipfiremake python-mechanize ipfiremake python-feedparser ipfiremake python-rssdler - ipfiremake libffi ipfiremake glib ipfiremake GeoIP ipfiremake fwhits @@ -629,6 +633,7 @@ buildipfire() { ipfiremake screen ipfiremake smartmontools ipfiremake htop + ipfiremake chkconfig ipfiremake postfix ipfiremake fetchmail ipfiremake cyrus-imapd @@ -636,6 +641,7 @@ buildipfire() { ipfiremake clamav ipfiremake spamassassin ipfiremake amavisd + ipfiremake dma ipfiremake alsa ipfiremake mpfire ipfiremake guardian @@ -650,6 +656,7 @@ buildipfire() { ipfiremake libshout ipfiremake xvid ipfiremake libmpeg2 + ipfiremake libarchive ipfiremake cmake ipfiremake gnump3d ipfiremake rsync @@ -673,7 +680,6 @@ buildipfire() { ipfiremake lm_sensors ipfiremake liboping ipfiremake collectd - ipfiremake teamspeak ipfiremake elinks ipfiremake igmpproxy ipfiremake fbset @@ -705,6 +711,11 @@ buildipfire() { ipfiremake mpd ipfiremake libmpdclient ipfiremake mpc + ipfiremake perl-Net-SMTP-SSL + ipfiremake perl-MIME-Base64 + ipfiremake perl-Authen-SASL + ipfiremake perl-MIME-Lite + ipfiremake perl-Email-Date-Format ipfiremake git ipfiremake squidclamav ipfiremake vnstat @@ -742,9 +753,11 @@ buildipfire() { ipfiremake iftop ipfiremake motion ipfiremake joe + ipfiremake monit ipfiremake nut ipfiremake watchdog ipfiremake libpri + ipfiremake libsrtp ipfiremake asterisk ipfiremake lcr ipfiremake usb_modeswitch @@ -817,6 +830,10 @@ buildipfire() { ipfiremake perl-PDF-API2 ipfiremake squid-accounting ipfiremake pigz + ipfiremake tmux + ipfiremake perl-Text-CSV_XS + ipfiremake swconfig + ipfiremake haproxy } buildinstaller() { @@ -976,7 +993,7 @@ build) cd $BASEDIR tools/checknewlog.pl - tools/checkwronginitlinks + tools/checkrootfiles cd $PWD beautify build_end