ARM: Fix packaging of xen-image and packages.

diff --git a/lfs/Config b/lfs/Config
index 82dbab8fb29ec0434e8562617d70fcdb83567630..9a8c3cdd2b56effca06958bebf65b720238b6363 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -191,7 +191,12 @@ define PAK
                cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
                /install/packages/package; \
        fi
-       cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
+       for i in $(DIR_SRC)/config/rootfiles/packages/{$(MACHINE),}/$(PROG); do \
+               if [ -e "$${i}" ]; then \
+                       cp -v $${i} /install/packages/package/ROOTFILES; \
+                       break; \
+               fi; \
+       done
        sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
        sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh

diff --git a/make.sh b/make.sh
index 3ca087240a33ec05011060e33d5bd58f698fab59..34c2a05607cb8006a0c9a9d1b93dc0f4fa769047 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -790,7 +790,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 ED=$IPFVER
@@ -827,7 +827,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