make.sh: add aarch qemu user binfmt magic

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

diff --git a/make.sh b/make.sh
index d2ce7d4d3faebdcc666fd6e5f6f63b04fffd2213..df7e74c925108ec434a309620713babee175eb3d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="145"                                                     # Core Level (Filename)
+CORE="148"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -804,7 +804,7 @@ qemu_is_required() {
        fi
 
        case "${HOST_ARCH},${build_arch}" in
-               x86_64,arm*|i?86,arm*|i?86,x86_64)
+               x86_64,arm*|x86_64,aarch64|i?86,arm*|i?86,aarch64|i?86,x86_64)
                        return 0
                        ;;
                *)
@@ -865,6 +865,9 @@ qemu_find_build_helper_name() {
                arm*)
                        magic="7f454c4601010100000000000000000002002800"
                        ;;
+               aarch64)
+                       magic="7f454c460201010000000000000000000200b700"
+                       ;;
                x86_64)
                        magic="7f454c4602010100000000000000000002003e00"
                        ;;
@@ -1188,15 +1191,6 @@ buildipfire() {
                lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
-               # x86-pae (Native and new XEN) kernel build
-               lfsmake2 linux                  KCFG="-pae"
-#              lfsmake2 backports                      KCFG="-pae"
-#              lfsmake2 e1000e                 KCFG="-pae"
-#              lfsmake2 igb                            KCFG="-pae"
-#              lfsmake2 ixgbe                  KCFG="-pae"
-               lfsmake2 xtables-addons         KCFG="-pae"
-               lfsmake2 linux-initrd                   KCFG="-pae"
-
                # x86 kernel build
                lfsmake2 linux                  KCFG=""
 #              lfsmake2 backports                      KCFG=""
@@ -1697,9 +1691,6 @@ buildpackages() {
 
   ipfirepackages
 
-  lfsmake2 xen-image
-  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
-
   cd $BASEDIR
 
   # remove not useable iso on armv5tel (needed to build flash images)