X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=1d85794733628a36e5286f161112d95e54b9f12f;hp=74c02a7e5833613f493fe1111e42fb19280f082e;hb=49abe7afb1868315b96643afe08c12fa1b339e3a;hpb=fffb777ee6f9c62f29966677045a6bdc705aece0 diff --git a/make.sh b/make.sh index 74c02a7e58..1d85794733 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="76-beta2" # Core Level (Filename) -PAKFIRE_CORE="76" # Core Level (PAKFIRE) +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 @@ -438,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" @@ -448,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 @@ -634,9 +636,6 @@ buildipfire() { ipfiremake libmpeg2 ipfiremake cmake ipfiremake gnump3d - ipfiremake libsigc++ - ipfiremake libtorrent - ipfiremake rtorrent ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent @@ -679,6 +678,8 @@ buildipfire() { ipfiremake vdr_streamdev ipfiremake vdr_vnsiserver3 ipfiremake vdr_epgsearch + ipfiremake vdr_dvbapi + ipfiremake vdr_eepg ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator @@ -794,6 +795,7 @@ buildipfire() { ipfiremake wavemon ipfiremake iptraf-ng ipfiremake iotop + ipfiremake stunnel } buildinstaller() { @@ -837,7 +839,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