X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=2ada02880296d8196dc16fe55b7386635826ccc2;hp=df95e44e35e359ef386fcfb94f90d2b93f3d219f;hb=5a9e26d83150750f8a7d1420007752df2639fb65;hpb=865f26ac3242fb39c6b83b19a7a52d83e7a91dfc

diff --git a/make.sh b/make.sh
index df95e44e3..2ada02880 100755
--- a/make.sh
+++ b/make.sh
@@ -32,7 +32,7 @@ SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 NICE=10								# Nice level
 MAX_RETRIES=1							# prefetch/check loop
-BUILD_IMAGES=1							# Build USB, Flash and Xen Images
+BUILD_IMAGES=1							# Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
@@ -380,23 +380,9 @@ buildipfire() {
   ipfiremake rpi-firmware
   ipfiremake bc
   ipfiremake u-boot
-  ipfiremake u-boot-panda
 
   if [ "${MACHINE_TYPE}" != "arm" ]; then
 
-    # x86-xen (Legacy XEN) kernel build
-    ipfiremake linux2			KCFG="-xen"
-    ipfiremake v4l-dvb			KCFG="-xen"
-    ipfiremake mISDN			KCFG="-xen"
-    ipfiremake cryptodev		KCFG="-xen"
-    ipfiremake compat-drivers		KCFG="-xen"
-    ipfiremake r8169			KCFG="-xen"
-    ipfiremake r8168			KCFG="-xen"
-    ipfiremake r8101			KCFG="-xen"
-    ipfiremake e1000			KCFG="-xen"
-    ipfiremake e1000e			KCFG="-xen"
-    ipfiremake igb			KCFG="-xen"
-
     # x86-pae (Native and new XEN) kernel build
     ipfiremake linux			KCFG="-pae"
 #    ipfiremake kvm-kmod			KCFG="-pae"
@@ -431,12 +417,9 @@ buildipfire() {
     ipfiremake cryptodev		KCFG="-rpi"
 #    ipfiremake compat-drivers		KCFG="-rpi"
 
-    # arm-omap (Panda Board) kernel build
-#    ipfiremake linux			KCFG="-omap"
-#    ipfiremake v4l-dvb			KCFG="-omap"
-#    ipfiremake mISDN			KCFG="-omap" NOPCI=1
-#    ipfiremake cryptodev		KCFG="-omap"
-#    ipfiremake compat-drivers		KCFG="-omap"
+    # arm multi platform (Panda, Wandboard ...) kernel build
+    ipfiremake linux			KCFG="-multi"
+    ipfiremake cryptodev		KCFG="-multi"
 
     # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux			KCFG="-kirkwood"
@@ -788,6 +771,7 @@ buildipfire() {
   ipfiremake arm
   ipfiremake wavemon
   ipfiremake iptraf-ng
+  ipfiremake iotop
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -817,7 +801,6 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake as86
-  ipfiremake mbr
   ipfiremake memtest
   ipfiremake installer
   installmake strip
@@ -863,16 +846,7 @@ buildpackages() {
 
   ipfirepackages
 
-  # Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
-        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
-        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
-        cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
-        cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
-	ipfiremake xen-image
-	rm -rf $LFS/install/packages/linux-xen-*.ipfire
-	rm -rf $LFS/install/packages/meta-linux-xen
-  fi
+  ipfiremake xen-image
   mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
   cd $BASEDIR