From 721af870bf9378535f7990976860f422c8e50116 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Wed, 29 Dec 2021 02:20:56 +0200
Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=9B=A0=20Make=20image=20prepare?=
 =?UTF-8?q?=20steps=20more=20verbose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile.toml         | 8 ++++++--
 nucleus/Makefile.toml | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.toml b/Makefile.toml
index c365f4d..d697f9f 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -117,8 +117,12 @@ script_runner = "@duckscript"
 script = [
 '''
     binaryFile = basename ${BINARY_FILE}
-    cp ${BINARY_FILE} ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target/${binaryFile}.elf
-    exec --fail-on-error ${OBJCOPY} %{OBJCOPY_PARAMS} ${BINARY_FILE} ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target/${binaryFile}.bin
+    outElf = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target/${binaryFile}.elf
+    outBin = set ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target/${binaryFile}.bin
+    cp ${BINARY_FILE} ${outElf}
+    exec --fail-on-error ${OBJCOPY} %{OBJCOPY_PARAMS} ${BINARY_FILE} ${outBin}
+    echo Copied ${binaryFile} to ${outElf}
+    echo Converted ${binaryFile} to ${outBin}
 '''
 ]
 install_crate = { crate_name = "cargo-binutils", binary = "rust-objcopy", test_arg = ["--help"] }
diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml
index bb1175a..b564a60 100644
--- a/nucleus/Makefile.toml
+++ b/nucleus/Makefile.toml
@@ -56,8 +56,9 @@ dependencies = ["build", "kernel-binary"]
 script_runner = "@duckscript"
 script = [
 '''
-    kernelImage = basename ${KERNEL_BIN}
+    kernelImage = set "kernel8.img"
     cp ${KERNEL_BIN} ${VOLUME}/${kernelImage}
+    echo "Copied nucleus to ${VOLUME}/${kernelImage}"
 '''
 ]