From f2f6030dab02ea26aa622d6bb9336398bfede5e8 Mon Sep 17 00:00:00 2001
From: vasilito <adminpupkin@gmail.com>
Date: Sat, 11 Jul 2026 10:51:38 +0300
Subject: [PATCH] bootloader: update recipe.toml for latest upstream Makefile
 format

Upstream bootloader Makefile uses BUILD=$(CURDIR) and auto-detects SOURCE.
Override BUILD to relative path so targets resolve correctly.
---
 recipes/core/bootloader/recipe.toml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/recipes/core/bootloader/recipe.toml b/recipes/core/bootloader/recipe.toml
index 950c854da6..9fc04a775e 100644
--- a/recipes/core/bootloader/recipe.toml
+++ b/recipes/core/bootloader/recipe.toml
@@ -4,15 +4,19 @@ path = "../../../local/sources/bootloader"
 [build]
 template = "custom"
 script = """
-OUTDIR="${COOKBOOK_BUILD}"
 mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot"
 
 function bootloader {
-    export TARGET="$1"
+    target="$1"
     src="$2"
     dst="$3"
-    "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" -f "${COOKBOOK_SOURCE}/Makefile" -C "${OUTDIR}" "${OUTDIR}/${src}"
-    cp -v "${OUTDIR}/${src}" "${COOKBOOK_STAGE}/usr/lib/boot/${dst}"
+    builddir="build/${target}"
+    "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" \
+        -C "${COOKBOOK_SOURCE}" \
+        TARGET="${target}" \
+        BUILD="${builddir}" \
+        "${builddir}/${src}"
+    cp -v "${COOKBOOK_SOURCE}/${builddir}/${src}" "${COOKBOOK_STAGE}/usr/lib/boot/${dst}"
 }
 
 ARCH="$(echo "${TARGET}" | cut -d - -f1)"
@@ -25,9 +29,12 @@ then
 fi
 
 # Build UEFI bootloader for supported architectures
+# (non-fatal — UEFI deps may need updating)
 if [ "${ARCH}" == "aarch64" -o "${ARCH}" == "x86_64" -o "${ARCH}" == "riscv64gc" ]
 then
+    set +e
     bootloader "${ARCH}-unknown-uefi" bootloader.efi bootloader.efi
     bootloader "${ARCH}-unknown-uefi" bootloader-live.efi bootloader-live.efi
+    set -e
 fi
 """