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 5ed15a0f5ad83fcef2f84b182ed3ddf489407360..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="146"                                                     # 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"
                        ;;
@@ -1346,8 +1349,6 @@ buildipfire() {
   lfsmake2 python-daemon
   lfsmake2 python-ipaddress
   lfsmake2 glib
-  lfsmake2 GeoIP
-  lfsmake2 geoip-database
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1634,10 +1635,10 @@ buildipfire() {
   lfsmake2 flashrom
   lfsmake2 firmware-update
   lfsmake2 tshark
-  lfsmake2 geoip-generator
   lfsmake2 speedtest-cli
   lfsmake2 rfkill
   lfsmake2 amazon-ssm-agent
+  lfsmake2 libloc
 }
 
 buildinstaller() {
@@ -1990,3 +1991,4 @@ find-dependencies)
        cat doc/make.sh-usage
        ;;
 esac
+