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

diff --cc lfs/Config
Simple merge

diff --cc make.sh
index 34c2a05607cb8006a0c9a9d1b93dc0f4fa769047,7ecc812e785aabc2520f4b5b54ab1b6e891862c8..15ab38b72cfe76736ac72196cd7457c9ff34b4d5
--- 1/make.sh
--- 2/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