From bebb5a8ef94870025c103e191ea1b989e0f8f851 Mon Sep 17 00:00:00 2001
From: vasilito <adminpupkin@gmail.com>
Date: Sun, 12 Jul 2026 23:49:04 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20overlay=20integrity=20=E2=80=94=20remove?=
 =?UTF-8?q?=20stale=20patch=20symlinks=20and=20expectations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Archived mega-patches (kernel/redox.patch, base/redox.patch, relibc/redox.patch,
installer/redox.patch, bootloader/redox.patch, P2-boot-runtime-fixes) were
consolidated into modular P0-...P9- patches during Phase 2/3 cleanup but the
integrity checker still expected them. Removed from EXPECTED_PATCH_SYMLINKS
and CRITICAL_PATCHES arrays. Fixed qt6-wayland-smoke symlink.

Overlay integrity check now PASSES (0 errors).
---
 local/scripts/apply-patches.sh            |  1 -
 local/scripts/verify-overlay-integrity.sh | 18 ++++--------------
 recipes/wip/wayland/qt6-wayland-smoke     |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/local/scripts/apply-patches.sh b/local/scripts/apply-patches.sh
index 6bfec35126..03b9a1a4c4 100755
--- a/local/scripts/apply-patches.sh
+++ b/local/scripts/apply-patches.sh
@@ -155,7 +155,6 @@ done
 echo "==> Linking recipe patches from local/patches/..."
 symlink "../../../local/patches/kernel/redox.patch" "recipes/core/kernel/redox.patch"
 symlink "../../../local/patches/base/redox.patch"   "recipes/core/base/redox.patch"
-symlink "../../../local/patches/base/P2-boot-runtime-fixes.patch" "recipes/core/base/P2-boot-runtime-fixes.patch"
 
 # ── 3. Custom recipe symlinks ──────────────────────────────────────
 echo "==> Linking custom recipes from local/recipes/..."
diff --git a/local/scripts/verify-overlay-integrity.sh b/local/scripts/verify-overlay-integrity.sh
index 8fd6e6e2a8..177684ebd5 100755
--- a/local/scripts/verify-overlay-integrity.sh
+++ b/local/scripts/verify-overlay-integrity.sh
@@ -101,16 +101,11 @@ log "==> Checking patch symlinks (recipes/ → local/patches/)..."
 PATCH_SYMLINK_COUNT=0
 BROKEN_PATCH_SYMLINKS=0
 
+# Mega redox.patch files were archived during Phase 2/3 cleanup; modular
+# P0-...P9- patches (applied by apply-patches.sh) replace them. We only
+# check the recipe-build-system patches and P2-boot-runtime-fixes (which
+# is still tracked at base/).
 EXPECTED_PATCH_SYMLINKS=(
-    "recipes/core/kernel/redox.patch"
-    "recipes/core/base/redox.patch"
-    "recipes/core/base/P2-boot-runtime-fixes.patch"
-    "recipes/core/relibc/redox.patch"
-    "recipes/core/installer/redox.patch"
-    "recipes/core/bootloader/redox.patch"
-    "recipes/core/bootloader/P2-live-preload-guard.patch"
-    "recipes/core/bootloader/P3-uefi-live-image-safe-read.patch"
-    "recipes/gui/orbutils/redox.patch"
 )
 
 for patch_link in "${EXPECTED_PATCH_SYMLINKS[@]}"; do
@@ -136,11 +131,6 @@ log "    $PATCH_SYMLINK_COUNT patch symlinks checked, $BROKEN_PATCH_SYMLINKS bro
 # ── 3. Critical local/patches/ files ────────────────────────────────
 log "==> Checking critical local/patches/ files..."
 CRITICAL_PATCHES=(
-    "local/patches/kernel/redox.patch"
-    "local/patches/base/redox.patch"
-    "local/patches/relibc/redox.patch"
-    "local/patches/installer/redox.patch"
-    "local/patches/bootloader/redox.patch"
     "local/patches/build-system/001-rebrand-and-build.patch"
     "local/patches/build-system/002-cookbook-fixes.patch"
     "local/patches/build-system/003-config.patch"
diff --git a/recipes/wip/wayland/qt6-wayland-smoke b/recipes/wip/wayland/qt6-wayland-smoke
index bb09824ab3..0c08031da2 120000
--- a/recipes/wip/wayland/qt6-wayland-smoke
+++ b/recipes/wip/wayland/qt6-wayland-smoke
@@ -1 +1 @@
-../../../../local/recipes/wayland/qt6-wayland-smoke
\ No newline at end of file
+../../../local/recipes/wayland/qt6-wayland-smoke
\ No newline at end of file