build-redbear: add pre-cook phase, pipe output to terminal
This commit is contained in:
@@ -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)}"
|
||||
|
||||
Reference in New Issue
Block a user