X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=8b6d8ea4de12cadf9bdd656b2ce05c7824ef518a;hp=de96a6303ad8b034e55ab81a4561d5d663bb0961;hb=8f836b573e152c58be51117338ac415e6451b20e;hpb=09d7a82c7c31350662d6f01066e7d4e44fd2f126

diff --git a/make.sh b/make.sh
index de96a6303a..8b6d8ea4de 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
 VERSION="2.5"
-CORE="29"
+CORE="31"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -338,8 +338,10 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake linux-xen
+  ipfiremake linux			XEN=1
   ipfiremake atl2			XEN=1
+  ipfiremake hso			XEN=1
+  ipfiremake e1000e			XEN=1
   ipfiremake kqemu			XEN=1
   ipfiremake v4l-dvb			XEN=1
   ipfiremake madwifi			XEN=1
@@ -349,6 +351,8 @@ buildipfire() {
   ipfiremake compat-wireless		XEN=1
   ipfiremake linux
   ipfiremake atl2
+  ipfiremake hso
+  ipfiremake e1000e
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
@@ -601,22 +605,24 @@ buildipfire() {
   ipfiremake sshfs
   ipfiremake sqlite
   ipfiremake taglib
-#  ipfiremake mediatomb
+  ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
-  ipfiremake x11libs
-  ipfiremake xen
+#  ipfiremake x11libs
+#  ipfiremake xen
   ipfiremake miau
-  ipfiremake net-snmp
+  ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
   ipfiremake cacti
+  ipfiremake icecc
   ipfiremake open-vm-tools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
+  ipfiremake joe
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -696,7 +702,7 @@ buildpackages() {
 
   # Create images for install
 	ipfiremake cdrom ED=$IPFVER
-	
+
   # Check if there is a loop device for building in virtual environments
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
 	ipfiremake usb-stick ED=$IPFVER
@@ -707,6 +713,16 @@ buildpackages() {
 
   ipfirepackages
 
+  # Check if there is a loop device for building in virtual environments
+  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
+	ipfiremake xen-image ED=$IPFVER
+	rm -rf $LFS/install/packages/linux-xen-*.ipfire
+	rm -rf $LFS/install/packages/meta-linux-xen
+  fi
+  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*