From 76b6aa5a50a4403e6513e7ee6d2f1332e9661ff7 Mon Sep 17 00:00:00 2001
From: Admin Pupkin <adminpupkin@gmail.com>
Date: Wed, 3 Jun 2026 11:17:39 +0300
Subject: [PATCH] build-redbear: add pre-cook phase, pipe output to terminal

---
 local/scripts/build-redbear.sh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/local/scripts/build-redbear.sh b/local/scripts/build-redbear.sh
index 968ee0b20c..d98398f666 100755
--- a/local/scripts/build-redbear.sh
+++ b/local/scripts/build-redbear.sh
@@ -229,18 +229,29 @@ fi
 
 bash "$PROJECT_ROOT/local/scripts/build-preflight.sh" --config="$CONFIG" ${REDBEAR_RELEASE:+--release="$REDBEAR_RELEASE"} --extra-package=relibc
 
+# Pre-cook critical packages that may fail in the dependency chain.
+# --with-package-deps resolves ALL transitive deps; pre-cooking ensures
+# the repo has valid pkgars before make live processes the full graph.
+echo ">>> Pre-cooking critical packages..."
+for pkg in relibc icu llvm21 mesa libdrm libepoxy redox-drm lcms2 libdisplay-info libxcvt kwin sddm qtbase; do
+    if [ ! -f "$PROJECT_ROOT/repo/x86_64-unknown-redox/$pkg.pkgar" ]; then
+        echo "    cooking $pkg..."
+        "$PROJECT_ROOT/target/release/repo" cook "$pkg" 2>&1 | tail -1 || true
+    fi
+done
+
 if [ "${REDBEAR_ALLOW_UPSTREAM:-0}" = "1" ]; then
     echo ">>> WARNING: Upstream fetch ENABLED (REDBEAR_ALLOW_UPSTREAM=1)"
-    REPO_OFFLINE=0 COOKBOOK_OFFLINE=false CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS"
+    REPO_OFFLINE=0 COOKBOOK_OFFLINE=false CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS" 2>&1
 elif [ -n "${REDBEAR_RELEASE:-}" ]; then
     echo ">>> Release mode: building from immutable archives (offline)"
-    REPO_OFFLINE=1 COOKBOOK_OFFLINE=true CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS"
+    REPO_OFFLINE=1 COOKBOOK_OFFLINE=true CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS" 2>&1
 elif [ "$ALLOW_UPSTREAM" -eq 1 ]; then
     echo ">>> Upstream recipe refresh enabled"
-    REPO_OFFLINE=0 COOKBOOK_OFFLINE=false CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS"
+    REPO_OFFLINE=0 COOKBOOK_OFFLINE=false CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS" 2>&1
 else
     echo ">>> Upstream recipe refresh disabled (default: offline)"
-    REPO_OFFLINE=1 COOKBOOK_OFFLINE=true CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS"
+    REPO_OFFLINE=1 COOKBOOK_OFFLINE=true CI=1 make live "CONFIG_NAME=$CONFIG" "JOBS=$JOBS" 2>&1
 fi
 
 ARCH="${ARCH:-$(uname -m)}"