#!/bin/bash # apply_patches.sh — Generic patch fetcher and applier for any backend. # # Usage: ./apply_patches.sh # # Directory containing a patches/ folder (with optional sources.yaml) # The cloned upstream repo to patch (e.g., llama.cpp/) # # Behavior (idempotent): # 1. If patches/sources.yaml exists and yq is available, for each source: # - If patches// already has .patch files: skip fetching (vendored) # - Otherwise: clone the fork, auto-detect the fork base via merge-base # with the upstream repo, and generate patches # 2. Apply all patches using patch --forward (skips already-applied patches) # 3. Fails fast on any patch application error set -e # Use /tmp for patch temp files to avoid macOS long-path issues export TMPDIR="${TMPDIR_OVERRIDE:-/tmp}" apply_one_patch() { local target_dir="$1" local patch_file="$2" local label="$3" # --forward skips patches that appear already applied (exit code 0 with a message) # We check dry-run first: if reverse-apply succeeds, patch is already in. if patch -d "$target_dir" -p1 --reverse --dry-run < "$patch_file" >/dev/null 2>&1; then echo " Already applied, skipping: $label" return 0 fi echo " Applying: $label" patch -d "$target_dir" -p1 --forward < "$patch_file" || { echo "FAILED: $patch_file"; exit 1; } } apply_patches() { local SOURCE_DIR="$(cd "$1" && pwd)" local TARGET_DIR="$2" local PATCHES_DIR="$SOURCE_DIR/patches" if [ ! -d "$PATCHES_DIR" ]; then return 0 fi # Phase 1: Generate missing patches from fork sources if [ -f "$PATCHES_DIR/sources.yaml" ] && command -v yq &>/dev/null; then local SOURCE_COUNT SOURCE_COUNT=$(yq '.sources | length' "$PATCHES_DIR/sources.yaml") for i in $(seq 0 $((SOURCE_COUNT - 1))); do local NAME REPO BRANCH UPSTREAM_REPO NAME=$(yq ".sources[$i].name" "$PATCHES_DIR/sources.yaml") REPO=$(yq ".sources[$i].repo" "$PATCHES_DIR/sources.yaml") BRANCH=$(yq ".sources[$i].branch" "$PATCHES_DIR/sources.yaml") UPSTREAM_REPO=$(yq ".sources[$i].upstream_repo" "$PATCHES_DIR/sources.yaml") local SOURCE_PATCH_DIR="$PATCHES_DIR/$NAME" local EXISTING EXISTING=$(ls "$SOURCE_PATCH_DIR"/*.patch 2>/dev/null | wc -l) if [ "$EXISTING" -gt 0 ]; then echo "Patches [$NAME]: $EXISTING patches already present — skipping fetch." else echo "Patches [$NAME]: fetching from $REPO ($BRANCH)" local TMPDIR_CLONE TMPDIR_CLONE=$(mktemp -d) if git clone --single-branch -b "$BRANCH" "$REPO" "$TMPDIR_CLONE/fork" 2>&1; then cd "$TMPDIR_CLONE/fork" # Auto-detect fork base: merge-base between fork and upstream git remote add upstream "$UPSTREAM_REPO" git fetch upstream 2>&1 local FORK_BASE FORK_BASE=$(git merge-base HEAD upstream/master 2>/dev/null || \ git merge-base HEAD upstream/main 2>/dev/null || echo "") if [ -z "$FORK_BASE" ]; then echo "WARNING: Could not find merge-base with upstream — skipping source '$NAME'" cd "$SOURCE_DIR" rm -rf "$TMPDIR_CLONE" continue fi local PATCH_COUNT PATCH_COUNT=$(git rev-list --count "$FORK_BASE"..HEAD 2>/dev/null || echo "0") echo " Fork base: ${FORK_BASE:0:12} ($PATCH_COUNT commits to extract)" if [ "$PATCH_COUNT" -gt 0 ]; then mkdir -p "$SOURCE_PATCH_DIR" git format-patch "$FORK_BASE"..HEAD -o "$SOURCE_PATCH_DIR/" >/dev/null 2>&1 echo " Generated $PATCH_COUNT patches in patches/$NAME/" fi cd "$SOURCE_DIR" else echo "WARNING: Failed to clone $REPO — skipping source '$NAME'" fi rm -rf "$TMPDIR_CLONE" fi done elif [ -f "$PATCHES_DIR/sources.yaml" ]; then echo "WARNING: yq not found — skipping source-based patch generation." fi # Phase 2: Apply patches (subdirectories first, then top-level) for source_dir in $(find "$PATCHES_DIR" -mindepth 1 -maxdepth 1 -type d | sort); do for p in $(ls "$source_dir"/*.patch 2>/dev/null | sort); do apply_one_patch "$TARGET_DIR" "$p" "$(basename "$source_dir")/$(basename "$p")" done done for p in $(ls "$PATCHES_DIR"/*.patch 2>/dev/null | sort); do apply_one_patch "$TARGET_DIR" "$p" "$(basename "$p")" done } # Run with arguments if [ $# -lt 2 ]; then echo "Usage: $0 " exit 1 fi apply_patches "$1" "$2"