From f871864bc88f791686eb8bc5b3e137a61e92fbf4 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 11 Mar 2022 16:25:57 -0700
Subject: [PATCH] Bootloader recipe update
---
recipes/bootloader/recipe.toml | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/recipes/bootloader/recipe.toml b/recipes/bootloader/recipe.toml
index dacd541c2..713158654 100644
--- a/recipes/bootloader/recipe.toml
+++ b/recipes/bootloader/recipe.toml
@@ -4,11 +4,18 @@ git = "https://gitlab.redox-os.org/redox-os/bootloader.git"
[build]
template = "custom"
script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+
ARCH="$(echo "${TARGET}" | cut -d - -f1)"
-nasm \
- -f bin \
- -o "${COOKBOOK_STAGE}/bootloader" \
- -D "ARCH_${ARCH}" \
- -i"${COOKBOOK_SOURCE}/${ARCH}/" \
- "${COOKBOOK_SOURCE}/${ARCH}/disk.asm"
+if [ "${ARCH}" == "x86_64" ]
+then
+ export TARGET="x86-unknown-none"
+ "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}"
+ cp "build/${TARGET}/bootloader.bin" "${COOKBOOK_STAGE}/bootloader"
+fi
+
+# TODO: fails due to environmental variables
+# export TARGET="${ARCH}-unknown-uefi"
+# cleanenv "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}"
+# cp "build/${TARGET}/bootloader.efi" "${COOKBOOK_STAGE}/bootloader.efi"
"""
--
GitLab