Don't remove old kernel version at update of linux-xen

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index ab5a40fa807887e25d4214bc0ea81664d2b51c68..3308db7b53ad01b6cc12bb4638eb7249796dccf3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 VERSION="2.5"
-CORE="30"
+CORE="31"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -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
@@ -605,14 +605,14 @@ 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
@@ -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/*