From bc5cf471af5b53ef955eb4c828642bfe591b449a Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 24 Jan 2023 12:06:03 +0100
Subject: debvm-create: install better kernels in multiarch case

While this works for armel+armhf by sheer luck, debvm-run fails for
i386+amd64 as it selects qemu-system-i386.
---
 share/customize-kernel.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'share/customize-kernel.sh')

diff --git a/share/customize-kernel.sh b/share/customize-kernel.sh
index 23c2cd0..3e1d12c 100755
--- a/share/customize-kernel.sh
+++ b/share/customize-kernel.sh
@@ -14,12 +14,15 @@ if dpkg-query --root="$TARGET" --showformat='${db:Status-Status}\n' --show 'linu
 	exit 0
 fi
 
-ARCHITECTURE=$(head -n1 "$TARGET/var/lib/dpkg/arch")
+ARCHITECTURES=$(xargs < "$TARGET/var/lib/dpkg/arch")
 
-KERNEL_ARCH="$ARCHITECTURE"
-case "$ARCHITECTURE" in
+KERNEL_ARCH="${ARCHITECTURES%% *}"
+case "$KERNEL_ARCH" in
 	armel)
 		KERNEL_ARCH=rpi
+		case "$ARCHITECTURES " in *" armhf "*)
+			KERNEL_ARCH=armmp:armhf
+		;; esac
 	;;
 	armhf)
 		KERNEL_ARCH=armmp
@@ -29,6 +32,9 @@ case "$ARCHITECTURE" in
 	;;
 	i386)
 		KERNEL_ARCH=686-pae
+		case "$ARCHITECTURES " in *" amd64 "*)
+			KERNEL_ARCH=amd64:amd64
+		;; esac
 	;;
 	mips64el)
 		KERNEL_ARCH=5kc-malta
-- 
cgit v1.2.3


From c405204a84eef99591cfe0ea41a873d508557b26 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Wed, 25 Jan 2023 09:27:54 +0100
Subject: debvm-create: handle multiarch kernel for 32bit+64bit arm

---
 share/customize-kernel.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'share/customize-kernel.sh')

diff --git a/share/customize-kernel.sh b/share/customize-kernel.sh
index 3e1d12c..aef9fa7 100755
--- a/share/customize-kernel.sh
+++ b/share/customize-kernel.sh
@@ -20,21 +20,25 @@ KERNEL_ARCH="${ARCHITECTURES%% *}"
 case "$KERNEL_ARCH" in
 	armel)
 		KERNEL_ARCH=rpi
-		case "$ARCHITECTURES " in *" armhf "*)
-			KERNEL_ARCH=armmp:armhf
-		;; esac
+		case "$ARCHITECTURES " in
+			*" arm64 "*) KERNEL_ARCH=arm64:arm64 ;;
+			*" armhf "*) KERNEL_ARCH=armmp:armhf ;;
+		esac
 	;;
 	armhf)
 		KERNEL_ARCH=armmp
+		case "$ARCHITECTURES " in
+			*" arm64 "*) KERNEL_ARCH=arm64:arm64 ;;
+		esac
 	;;
 	hppa)
 		KERNEL_ARCH=parisc
 	;;
 	i386)
 		KERNEL_ARCH=686-pae
-		case "$ARCHITECTURES " in *" amd64 "*)
-			KERNEL_ARCH=amd64:amd64
-		;; esac
+		case "$ARCHITECTURES " in
+			*" amd64 "*) KERNEL_ARCH=amd64:amd64 ;;
+		esac
 	;;
 	mips64el)
 		KERNEL_ARCH=5kc-malta
-- 
cgit v1.2.3