Update openvpn from 2.0.9 to 2.1_rc19

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

diff --git a/make.sh b/make.sh
index de96a6303ad8b034e55ab81a4561d5d663bb0961..ed07b495408f5f2bcaf586dfc2015d3cbac02cd3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 VERSION="2.5"
-CORE="29"
+CORE="30"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -338,17 +338,21 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake linux-xen
-  ipfiremake atl2                      XEN=1
-  ipfiremake kqemu                     XEN=1
-  ipfiremake v4l-dvb                   XEN=1
-  ipfiremake madwifi                   XEN=1
+  #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
 #  ipfiremake alsa                     XEN=1 KMOD=1
-  ipfiremake openswan                  XEN=1 KMOD=1
-  ipfiremake mISDN                     XEN=1
-  ipfiremake compat-wireless           XEN=1
+  #ipfiremake openswan                 XEN=1 KMOD=1
+  #ipfiremake mISDN                    XEN=1
+  #ipfiremake compat-wireless          XEN=1
   ipfiremake linux
   ipfiremake atl2
+  ipfiremake hso
+  ipfiremake e1000e
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
@@ -605,14 +609,15 @@ buildipfire() {
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
-  ipfiremake x11libs
-  ipfiremake xen
+#  ipfiremake x11libs
+#  ipfiremake xen
   ipfiremake miau
   ipfiremake net-snmp
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
   ipfiremake cacti
+  ipfiremake icecc
   ipfiremake open-vm-tools
   ipfiremake nagiosql
   ipfiremake iftop
@@ -696,7 +701,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 +712,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/*