X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=5bff402a4bf65e2ef8ccbb0029819a03a362ece7;hp=9bae8a679f0f0c661a11029e3654f4d9ca3a51b3;hb=dd58c50c3e55749903369c2b3258de7cc307c8ce;hpb=6b0d7d6bc3e5870a8f0ada33e2ab3170f942db9e diff --git a/make.sh b/make.sh index 9bae8a679..5bff402a4 100755 --- a/make.sh +++ b/make.sh @@ -17,17 +17,17 @@ # 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-2013 IPFire Team . # +# Copyright (C) 2007-2014 IPFire Team . # # # ############################################################################ # NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.13" # Version number -CORE="73" # Core Level (Filename) -PAKFIRE_CORE="72" # Core Level (PAKFIRE) -GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch +VERSION="2.15" # Version number +CORE="77" # Core Level (Filename) +PAKFIRE_CORE="77" # 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 NICE=10 # Nice level @@ -360,7 +360,7 @@ buildbase() { lfsmake2 make lfsmake2 man lfsmake2 mktemp - lfsmake2 module-init-tools + lfsmake2 kmod lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@ -369,8 +369,8 @@ buildbase() { lfsmake2 sysvinit lfsmake2 tar lfsmake2 texinfo - lfsmake2 udev lfsmake2 util-linux + lfsmake2 udev lfsmake2 vim lfsmake2 xz lfsmake2 paxctl @@ -386,6 +386,7 @@ buildipfire() { ipfiremake dhcp ipfiremake dhcpcd ipfiremake libusb + ipfiremake libusbx ipfiremake libpcap ipfiremake ppp ipfiremake pptp @@ -410,8 +411,8 @@ buildipfire() { # ipfiremake r8169 KCFG="-pae" # ipfiremake r8168 KCFG="-pae" # ipfiremake r8101 KCFG="-pae" -# ipfiremake e1000e KCFG="-pae" -# ipfiremake igb KCFG="-pae" + ipfiremake e1000e KCFG="-pae" + ipfiremake igb KCFG="-pae" # x86 kernel build ipfiremake linux KCFG="" @@ -423,8 +424,8 @@ buildipfire() { # ipfiremake r8169 KCFG="" # ipfiremake r8168 KCFG="" # ipfiremake r8101 KCFG="" -# ipfiremake e1000e KCFG="" -# ipfiremake igb KCFG="" + ipfiremake e1000e KCFG="" + ipfiremake igb KCFG="" else # arm-rpi (Raspberry Pi) kernel build @@ -437,6 +438,8 @@ buildipfire() { # arm multi platform (Panda, Wandboard ...) kernel build ipfiremake linux KCFG="-multi" ipfiremake cryptodev KCFG="-multi" + ipfiremake e1000e KCFG="-multi" + ipfiremake igb KCFG="-multi" # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" @@ -447,8 +450,8 @@ buildipfire() { # 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" fi ipfiremake pkg-config @@ -459,6 +462,7 @@ buildipfire() { ipfiremake gdbm ipfiremake pam ipfiremake openssl + ipfiremake openssl-compat ipfiremake curl ipfiremake tcl ipfiremake sqlite @@ -493,6 +497,7 @@ buildipfire() { ipfiremake apache2 ipfiremake php ipfiremake apache2 PASS=C + ipfiremake jquery ipfiremake arping ipfiremake beep ipfiremake dvdrtools @@ -509,6 +514,8 @@ buildipfire() { ipfiremake perl-GD ipfiremake GD-Graph ipfiremake GD-TextUtil + ipfiremake perl-Device-SerialPort + ipfiremake perl-Device-Modem ipfiremake gnupg ipfiremake hdparm ipfiremake sdparm @@ -593,6 +600,8 @@ buildipfire() { ipfiremake lzo ipfiremake openvpn ipfiremake pammysql + ipfiremake mpage + ipfiremake dbus ipfiremake cups ipfiremake ghostscript ipfiremake foomatic @@ -629,9 +638,6 @@ buildipfire() { ipfiremake libmpeg2 ipfiremake cmake ipfiremake gnump3d - ipfiremake libsigc++ - ipfiremake libtorrent - ipfiremake rtorrent ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent @@ -646,6 +652,7 @@ buildipfire() { ipfiremake sysstat ipfiremake vsftpd ipfiremake strongswan + ipfiremake rng-tools ipfiremake lsof ipfiremake br2684ctl ipfiremake pcmciautils @@ -673,6 +680,8 @@ buildipfire() { ipfiremake vdr_streamdev ipfiremake vdr_vnsiserver3 ipfiremake vdr_epgsearch + ipfiremake vdr_dvbapi + ipfiremake vdr_eepg ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator @@ -682,7 +691,6 @@ buildipfire() { ipfiremake git ipfiremake squidclamav ipfiremake vnstat - ipfiremake vnstati ipfiremake iw ipfiremake wpa_supplicant ipfiremake hostapd @@ -691,7 +699,6 @@ buildipfire() { ipfiremake syslinux ipfiremake tftpd ipfiremake cpufrequtils - ipfiremake dbus ipfiremake bluetooth ipfiremake gutenprint ipfiremake apcupsd @@ -711,6 +718,8 @@ buildipfire() { ipfiremake netsnmpd ipfiremake perl-DBI ipfiremake perl-DBD-mysql + ipfiremake perl-DBD-SQLite + ipfiremake perl-File-ReadBackwards ipfiremake cacti ipfiremake icecc ipfiremake openvmtools @@ -727,7 +736,6 @@ buildipfire() { ipfiremake usb_modeswitch_data ipfiremake zerofree ipfiremake mdadm - ipfiremake eject ipfiremake pound ipfiremake minicom ipfiremake ddrescue @@ -764,7 +772,6 @@ buildipfire() { ipfiremake stress ipfiremake libstatgrab ipfiremake sarg - ipfiremake fstrim ipfiremake check_mk_agent ipfiremake libdaemon ipfiremake avahi @@ -789,6 +796,7 @@ buildipfire() { ipfiremake wavemon ipfiremake iptraf-ng ipfiremake iotop + ipfiremake stunnel } buildinstaller() { @@ -832,7 +840,8 @@ buildpackages() { ipfiremake cdrom # Check if there is a loop device for building in virtual environments - if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then + modprobe loop 2>/dev/null + if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then ipfiremake flash-images fi @@ -1081,11 +1090,11 @@ uploadsrc) fi URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }') - REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) + REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) - cd $BASEDIR/cache/ - for file in $(ls -1 --ignore=toolchains); do - grep -q "$file" <<<$REMOTE_FILES && continue + for file in ${BASEDIR}/cache/*; do + [ -d "${file}" ] && continue + grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue NEW_FILES="$NEW_FILES $file" done [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}