Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/make.sh b/make.sh
index 94f3f5b34735071215162b2dee0c9c5c5ea45fec..62f0a55c217b0a80280d13ad007218c1259956bb 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -341,16 +341,16 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake which
   ipfiremake xz
-#  ipfiremake linux                    XEN=1
-#  ipfiremake kqemu                    XEN=1
-#  #ipfiremake kvm-kmod                        XEN=1
-#  ipfiremake v4l-dvb                  XEN=1
-#  ipfiremake madwifi                  XEN=1
-#  #ipfiremake alsa                    XEN=1 KMOD=1
-#  ipfiremake dahdi                    XEN=1 KMOD=1
-#  ipfiremake openswan                 XEN=1 KMOD=1
-#  ipfiremake mISDN                    XEN=1
-#  ipfiremake compat-wireless          XEN=1
+  ipfiremake linux                     XEN=1
+  ipfiremake kqemu                     XEN=1
+  #ipfiremake kvm-kmod                 XEN=1
+  ipfiremake v4l-dvb                   XEN=1
+  ipfiremake madwifi                   XEN=1
+  #ipfiremake alsa                     XEN=1 KMOD=1
+  ipfiremake dahdi                     XEN=1 KMOD=1
+  ipfiremake openswan                  XEN=1 KMOD=1
+  #ipfiremake mISDN                    XEN=1
+  #ipfiremake compat-wireless          XEN=1
   ipfiremake linux
   ipfiremake kqemu
   #ipfiremake kvm-kmod
@@ -550,6 +550,7 @@ buildipfire() {
   ipfiremake br2684ctl
   ipfiremake pcmciautils
   ipfiremake lm_sensors
+  ipfiremake liboping
   ipfiremake collectd
   ipfiremake lcd4linux
   ipfiremake tcptrack
@@ -726,15 +727,15 @@ 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
-#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+  # 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
   stdumount