X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=6a7c63aa0b99944b3e219d3754cc969ed5af3f3b;hp=d04d2bf63a3fe5e3f2b7d5c89162adaa178bb6c0;hb=f06c8adbc747554d7b7581e40b40139285848c54;hpb=382f7785575819d858745c4142cd172fae1208f8

diff --git a/make.sh b/make.sh
index d04d2bf63a..6a7c63aa0b 100755
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.5"							# Version number
-CORE="36"							# Core Level (Filename)
+VERSION="2.6"							# Version number
+CORE="37"							# Core Level (Filename)
 PAKFIRE_CORE="36"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
@@ -340,14 +340,8 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
+  ipfiremake xz
   ipfiremake linux			XEN=1
-  ipfiremake atl1c			XEN=1
-  ipfiremake atl2			XEN=1
-  ipfiremake hso			XEN=1
-  ipfiremake e1000e			XEN=1
-  ipfiremake r8101			XEN=1
-  ipfiremake r8169			XEN=1
-  ipfiremake r8168			XEN=1
   ipfiremake kqemu			XEN=1
   #ipfiremake kvm-kmod			XEN=1
   ipfiremake v4l-dvb			XEN=1
@@ -355,25 +349,20 @@ buildipfire() {
   #ipfiremake alsa			XEN=1 KMOD=1
   ipfiremake dahdi			XEN=1 KMOD=1
   ipfiremake openswan			XEN=1 KMOD=1
-  ipfiremake mISDN			XEN=1
-  ipfiremake compat-wireless		XEN=1
+  #ipfiremake mISDN			XEN=1
+  #ipfiremake compat-wireless		XEN=1
+  ipfiremake cryptodev			XEN=1
   ipfiremake linux
-  ipfiremake atl1c
-  ipfiremake atl2
-  ipfiremake hso
-  ipfiremake e1000e
-  ipfiremake r8101
-  ipfiremake r8169
-  ipfiremake r8168
   ipfiremake kqemu
-  ipfiremake kvm-kmod
+  #ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
   ipfiremake dahdi			KMOD=1
   ipfiremake openswan			KMOD=1
-  ipfiremake mISDN
-  ipfiremake compat-wireless
+  #ipfiremake mISDN
+  #ipfiremake compat-wireless
+  ipfiremake cryptodev
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -563,6 +552,7 @@ buildipfire() {
   ipfiremake br2684ctl
   ipfiremake pcmciautils
   ipfiremake lm_sensors
+  ipfiremake liboping
   ipfiremake collectd
   ipfiremake lcd4linux
   ipfiremake tcptrack
@@ -582,6 +572,7 @@ buildipfire() {
   ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
+  ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr
@@ -643,6 +634,8 @@ buildipfire() {
   ipfiremake lcr
   ipfiremake usb_modeswitch
   ipfiremake zerofree
+  ipfiremake mdadm
+  ipfiremake eject
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -652,7 +645,7 @@ 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" ]; then
+  if [ "$GIT_BRANCH" = "next" ]; then
 	echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
 	echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release