[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4576ca4cc798d664a2d551762058c98d311ac0bc

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4576ca4cc798d664a2d551762058c98d311ac0bc

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2625 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  4576ca4cc798d664a2d551762058c98d311ac0bc (commit)
      from  0db0f7facfdab21cf7bb040613f7ea64a1797ce8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4576ca4cc798d664a2d551762058c98d311ac0bc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 5 17:00:54 2020 +0000

    make.sh: Add cross-building for aarch64
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/make.sh-usage | 10 +++++-----
 make.sh           |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/doc/make.sh-usage b/doc/make.sh-usage
index 78a73efac..5e1e3dd22 100644
--- a/doc/make.sh-usage
+++ b/doc/make.sh-usage
@@ -16,8 +16,8 @@ Maintainer / advanced commands
 
 
 Options:
-    --target=[armv5tel|i586] : Cross-compile for this target architecture.
-                               Uses the QEMU emulator if needed to virtualise
-                               the desired target architecture.
-                               Can be permanently set with TARGET_ARCH= in
-                               .config.
+    --target=[aarch64|armv5tel|i586] : Cross-compile for this target architecture.
+                                       Uses the QEMU emulator if needed to virtualise
+                                       the desired target architecture.
+                                       Can be permanently set with TARGET_ARCH= in
+                                       .config.
diff --git a/make.sh b/make.sh
index df7e74c92..544320f09 100755
--- a/make.sh
+++ b/make.sh
@@ -862,12 +862,12 @@ qemu_find_build_helper_name() {
 
 	local magic
 	case "${build_arch}" in
-		arm*)
-			magic="7f454c4601010100000000000000000002002800"
-			;;
 		aarch64)
 			magic="7f454c460201010000000000000000000200b700"
 			;;
+		arm*)
+			magic="7f454c4601010100000000000000000002002800"
+			;;
 		x86_64)
 			magic="7f454c4602010100000000000000000002003e00"
 			;;


hooks/post-receive
--
IPFire 2.x development tree