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 ab5a40fa807887e25d4214bc0ea81664d2b51c68..ed07b495408f5f2bcaf586dfc2015d3cbac02cd3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -338,17 +338,17 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake linux-xen
-  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 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
@@ -609,8 +609,8 @@ buildipfire() {
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
-  ipfiremake x11libs
-  ipfiremake xen
+#  ipfiremake x11libs
+#  ipfiremake xen
   ipfiremake miau
   ipfiremake net-snmp
   ipfiremake perl-DBI
@@ -701,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
@@ -712,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/*