From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 15 Sep 2013 16:42:33 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=5a6804a2472af03dd6744bb3385408d369659931;hp=-c

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

5a6804a2472af03dd6744bb3385408d369659931
diff --combined make.sh
index 55a4f0137,773718ab5..4d379606f
--- a/make.sh
+++ b/make.sh
@@@ -32,7 -32,7 +32,7 @@@ SLOGAN="www.ipfire.org"						# Softwar
  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,22 -380,10 +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"
@@@ -430,9 -418,12 +417,9 @@@
      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"
@@@ -852,9 -843,6 +839,6 @@@ buildpackages() 
  
    # Check if there is a loop device for building in virtual environments
    if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
- 	if [ "${MACHINE_TYPE}" != "arm" ]; then
- 		ipfiremake usb-stick
- 	fi
  	ipfiremake flash-images
    fi
  
@@@ -862,16 -850,7 +846,7 @@@
  
    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