Re: [PATCH 1/2] Force MKISOFO=xorriso for arm64 too

[Ian Campbell <ijc@debian.org>]

On Sat, 2014-10-04 at 10:48 +0100, Ian Campbell wrote:
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 54393a7..5413e87 100755
> --- a/Makefile
> +++ b/Makefile
> @@ -21,7 +21,7 @@ ifndef TASK
>  TASK=Debian-generic
>  endif
>  ifndef MKISOFS
> -ifneq (,$(filter i386 amd64,$(ARCHES)))
> +ifneq (,$(filter i386 arm64 amd64,$(ARCHES)))

This got pushed as "i386 amd64 amd64" (i.e. amd64 twice...)

And the header now says "Do install stuff for xarm64" (a vi error?)

This should fix them up:

>From 450c1a7a96d65fdf2f8d6ea4c06f8092d4ea2efd Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@debian.org>
Date: Sat, 4 Oct 2014 10:46:12 +0100
Subject: [PATCH] Fix a couple of typos.

Listing amd64 twice in the xorriso selection rune in Makefile, one should be
arm64.

s/xarm64/arm64/
---
 Makefile                     | 2 +-
 tools/boot/jessie/boot-arm64 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b0b1dad..5413e87 100755
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ ifndef TASK
 TASK=Debian-generic
 endif
 ifndef MKISOFS
-ifneq (,$(filter i386 amd64 amd64,$(ARCHES)))
+ifneq (,$(filter i386 arm64 amd64,$(ARCHES)))
 export MKISOFS=xorriso
 export MKISOFS_OPTS=-as mkisofs -r -checksum_algorithm_iso md5,sha1
 else
diff --git a/tools/boot/jessie/boot-arm64 b/tools/boot/jessie/boot-arm64
index d3cbc4e..052e15c 100755
--- a/tools/boot/jessie/boot-arm64
+++ b/tools/boot/jessie/boot-arm64
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Based on boot-x86
+# Based on boot-x86.
 #
-# Do install stuff for xarm64, including making bootable CDs
+# Do install stuff for arm64, including making bootable CDs
 # Works with debian-installer
 #
 # $1 is the CD number
-- 
2.1.0