From c2b09f0a3271a2aaa3810bbddf340824ca515775 Mon Sep 17 00:00:00 2001 From: vasilito Date: Sun, 12 Jul 2026 17:43:12 +0300 Subject: [PATCH] fix: 005-qtbase patch signature checks wrong file path Patch creates recipes/wip/qt/qtbase/recipe.toml but the signature check looked for REDBEAR marker in recipes/libs/qtbase/recipe.toml (wrong path). Also added check for local recipe existence (takes precedence per local-over-WIP policy). This was causing overlay integrity check failures during redbear-mini builds even though Qt is irrelevant for the console target. --- local/scripts/apply-patches.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/local/scripts/apply-patches.sh b/local/scripts/apply-patches.sh index f7a0cb2944..6bfec35126 100755 --- a/local/scripts/apply-patches.sh +++ b/local/scripts/apply-patches.sh @@ -113,8 +113,10 @@ for patch_file in "$PATCHES_DIR"/build-system/[0-9]*.patch; do grep -q 'Red Bear OS' README.md 2>/dev/null && already_applied=1 ;; 005-qtbase-toolchain-elf-header.patch) - # This patch touches recipes/libs/qtbase; check for our marker - grep -q 'REDBEAR' recipes/libs/qtbase/recipe.toml 2>/dev/null && already_applied=1 + # This patch creates recipes/wip/qt/qtbase/recipe.toml; check if it already exists + grep -q 'REDBEAR\|Qt6' recipes/wip/qt/qtbase/recipe.toml 2>/dev/null && already_applied=1 + # Also check the local recipe (takes precedence per local-over-WIP policy) + [ -f local/recipes/qt/qtbase/recipe.toml ] && already_applied=1 ;; esac if [ "$already_applied" -eq 1 ]; then