From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Sep 2011 14:01:58 +0000 (+0200)
Subject: Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into... 
X-Git-Tag: v2.9-core54~13^2~57
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=7273a322385000e403df6a9569f6352247b3ff30

Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into arm-port
---

7273a322385000e403df6a9569f6352247b3ff30
diff --cc make.sh
index 34c2a05607,7ecc812e78..15ab38b72c
--- a/make.sh
+++ b/make.sh
@@@ -790,10 -791,10 +791,10 @@@ 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 ]); then
 +  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/
- 	ipfiremake xen-image ED=$IPFVER
+ 	ipfiremake xen-image
  	rm -rf $LFS/install/packages/linux-xen-*.ipfire
  	rm -rf $LFS/install/packages/meta-linux-xen
    fi