X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=d13e8aac872cac1579172ab98f38181dd2e0fcd0;hp=af178484cd38cd3832dd6d63b19fc29011af0572;hb=179d4328d33ca888b5a65c35b7aa430a9c3b7a27;hpb=3f4aa73d566dfdcfb0e358b738a4e3b0ebe0b91f

diff --git a/make.sh b/make.sh
index af178484cd..d13e8aac87 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.5"							# Version number
-CORE="33"							# Core Level (Filename)
-PAKFIRE_CORE="32"						# Core Level (PAKFIRE)
+CORE="34"							# Core Level (Filename)
+PAKFIRE_CORE="33"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@ -340,20 +340,20 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake linux			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 v4l-dvb			XEN=1
-  ipfiremake madwifi			XEN=1
-#  ipfiremake alsa			XEN=1 KMOD=1
-  ipfiremake openswan			XEN=1 KMOD=1
-  ipfiremake mISDN			XEN=1
-  ipfiremake compat-wireless		XEN=1
+#  ipfiremake linux			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 v4l-dvb			XEN=1
+#  ipfiremake madwifi			XEN=1
+##  ipfiremake alsa			XEN=1 KMOD=1
+#  ipfiremake openswan			XEN=1 KMOD=1
+#  ipfiremake mISDN			XEN=1
+#  ipfiremake compat-wireless		XEN=1
   ipfiremake linux
   ipfiremake atl2
   ipfiremake hso
@@ -362,6 +362,7 @@ buildipfire() {
   ipfiremake r8169
   ipfiremake r8168
   ipfiremake kqemu
+  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
@@ -727,14 +728,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/
-        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
+#  # 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