X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=c5cd8f01e4f3543a2c3d987017a594e8f18891c4;hp=a913a3b91ee11b6b29b4c28e29a2624cee804a8b;hb=3a65a332d28616f6f6833d90b1fc936137af30fd;hpb=2b2e03eded667aea41f564e4ea982cdf77a32f08

diff --git a/make.sh b/make.sh
index a913a3b91..c5cd8f01e 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.3"
+VERSION="2.5beta2"
 CORE="28"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
@@ -595,7 +595,7 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  ipfiremake cryptsetup
+  #ipfiremake cryptsetup
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
@@ -606,12 +606,13 @@ buildipfire() {
   ipfiremake perl-gettext
   ipfiremake vdradmin
   ipfiremake x11libs
-#  ipfiremake xen
+  ipfiremake xen
   ipfiremake miau
   ipfiremake net-snmp
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
+  ipfiremake cacti
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -621,6 +622,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+  echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release
 }
 
 buildinstaller() {
@@ -696,8 +698,6 @@ buildpackages() {
 	ipfiremake usb-stick ED=$IPFVER
   fi
 
-  # Create updater package
-  #ipfiremake updater
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages