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

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

diff --git a/make.sh b/make.sh
index 7ecc812e785aabc2520f4b5b54ab1b6e891862c8..15ab38b72cfe76736ac72196cd7457c9ff34b4d5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -413,7 +413,7 @@ buildipfire() {
   ipfiremake kqemu
   ipfiremake kvm-kmod
   ipfiremake madwifi
-  if [ "${MACHINE_TYPE}" = "arm" ]; then
+  if [ "${MACHINE_TYPE}" != "arm" ]; then
     #todo enable alsa driver in kernel config
     ipfiremake alsa                    KMOD=1
   fi
@@ -791,7 +791,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 ]); 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
@@ -828,7 +828,10 @@ buildpackages() {
 
 ipfirepackages() {
        ipfiremake core-updates
-       for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
+
+       local i
+       for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do
+               i=$(basename ${i})
                if [ -e $BASEDIR/lfs/$i ]; then
                        ipfiredist $i
                else