From 606cff8f4af39d821db8e45fcb1c7bb510db45a9 Mon Sep 17 00:00:00 2001
From: vasilito <adminpupkin@gmail.com>
Date: Sun, 12 Jul 2026 17:44:21 +0300
Subject: [PATCH] fix: skip diverged forks in drift check + fix 005 patch
 signature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

check-fork-drift.sh: diverged forks (kernel, bootloader, installer)
are intentionally ahead of upstream — skip them to suppress spurious
DRIFT warnings during build preflight.

apply-patches.sh: 005-qtbase patch signature now checks correct path
(recipes/wip/qt/qtbase/recipe.toml) and respects local recipe override.
---
 local/scripts/check-fork-drift.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/local/scripts/check-fork-drift.sh b/local/scripts/check-fork-drift.sh
index 9c6f9366cc..7db65a032e 100755
--- a/local/scripts/check-fork-drift.sh
+++ b/local/scripts/check-fork-drift.sh
@@ -78,6 +78,12 @@ for fork in "${FORKS[@]}"; do
         continue
     fi
 
+    # Respect diverged mode from fork-upstream-map.toml — these forks are
+    # intentionally ahead of upstream with RB-specific work. Drift is expected.
+    if grep -q "^${fork}[[:space:]]\+.*diverged" "$PROJECT_ROOT/local/fork-upstream-map.toml" 2>/dev/null; then
+        continue
+    fi
+
     # Determine upstream branch (master or main)
     upstream_branch="master"
     if ! (cd "$fork_dir" && git rev-parse --verify upstream/master >/dev/null 2>&1); then