Origin: updated from https://salsa.debian.org/live-team/live-build/-/commit/15e78a3e
Forwarded: not-needed
--- live-build-3.0~a57.orig/scripts/build/lb_binary_memtest
+++ live-build-3.0~a57/scripts/build/lb_binary_memtest
@@ -62,13 +62,14 @@ then
 fi
 
 # Checking depends
+MEMTEST_BIN="${LB_MEMTEST}"
 case "${LB_MEMTEST}" in
 	memtest86)
 		Check_package chroot/boot/memtest86.bin memtest86
 		;;
 
 	memtest86+)
-		Check_package chroot/boot/memtest86+.bin memtest86+
+		Check_package chroot/usr/share/doc/memtest86+/copyright memtest86+
 		;;
 esac
 
@@ -78,6 +79,19 @@ Restore_cache cache/packages.binary
 # Installing depends
 Install_package
 
+case "${LB_MEMTEST}" in
+	memtest86+)
+		case "${LB_BUILD_WITH_CHROOT}" in
+			true)
+				[ -e "chroot/boot/${LB_MEMTEST}x64.bin" ] && _MEMTEST_BIN="${LB_MEMTEST}x64"
+				;;
+			false)
+				[ -e "/boot/${LB_MEMTEST}x64.bin" ] && _MEMTEST_BIN="${LB_MEMTEST}x64"
+				;;
+		esac
+		;;
+esac
+
 # Setting destination directory
 case "${LB_INITRAMFS}" in
 	casper)
@@ -101,11 +115,11 @@ mkdir -p "${DESTDIR}"
 # Installing memtest
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
-		cp chroot/boot/${LB_MEMTEST}.bin "${DESTDIR}"/memtest
+		cp "chroot/boot/${_MEMTEST_BIN}.bin" "${DESTDIR}"/memtest
 		;;
 
 	false)
-		cp /boot/${LB_MEMTEST}.bin "${DESTDIR}"/memtest
+		cp "/boot/${_MEMTEST_BIN}.bin" "${DESTDIR}"/memtest
 		;;
 esac
 
