X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=512aba76c4d3bba10f093f7abfae15650197be45;hp=ab5a40fa807887e25d4214bc0ea81664d2b51c68;hb=f399dfa46978a9d7d3d8761919a2fca7414c098c;hpb=a9349373db65c67340e11df5dad470c15025de40

diff --git a/make.sh b/make.sh
index ab5a40fa80..512aba76c4 100755
--- a/make.sh
+++ b/make.sh
@@ -338,7 +338,7 @@ 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
@@ -609,10 +609,10 @@ buildipfire() {
   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
@@ -622,6 +622,7 @@ buildipfire() {
   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
@@ -701,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
@@ -712,6 +713,14 @@ 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/
+	ipfiremake xen-image ED=$IPFVER
+	rm -rf $LFS/install/packages/linux-xen-*.ipfire
+  fi
+  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*