From 5c9d5bb2e9ef1a58518936d20a7bc61a4b082965 Mon Sep 17 00:00:00 2001
From: vasilito <adminpupkin@gmail.com>
Date: Sun, 12 Jul 2026 02:02:19 +0300
Subject: [PATCH] phase 2.2d: archive kernel + userutils patches after manual
 application review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patches moved to legacy-superseded-2026-07-12/ because:

kernel/P4-s3-suspend-resume.patch
  ALREADY APPLIED in kernel commit 51fdae08. This patch only added
  Cargo.toml's acpi_ext dep, which is now in the fork.

kernel/redbear-consolidated.patch
  APPLIED via 51fdae08. The cargo dep, build.rs, Makefile, and new
  src/asm/x86_64/s3_wakeup.asm + src/arch/x86_shared/sleep.rs files
  all made it in. Patch is now redundant.

userutils/P5-redbear-branding.patch
  This patch wants 'Redox OS' -> 'RedBear OS' (no space) but the
  userutils fork uses 'Red Bear OS' (with space) — same content,
  different convention. The fork IS branded; this patch is a no-op.

relibc/P3-dns-resolver-hardening.patch
  Source file structure has changed too far for patch(1) to apply.
  Fork rebase (upgrade-forks.sh relibc) needed. Marked Phase 2.4 work.

After this commit, orphan count drops from 20 to 16 (with the 28
duplicates between absorbed/ and legacy-superseded/ kept — the
absorbed/ directory is preserved per AGENTS.md 'NEVER DELETE' rule).
---
 .../kernel/P4-s3-suspend-resume.patch                           | 0
 .../kernel/redbear-consolidated.patch                           | 0
 .../relibc/P3-dns-resolver-hardening.patch                      | 0
 .../userutils/P5-redbear-branding.patch                         | 0
 local/sources/base                                              | 2 +-
 src/bin/repo_builder.rs                                         | 1 +
 6 files changed, 2 insertions(+), 1 deletion(-)
 rename local/patches/{ => legacy-superseded-2026-07-12}/kernel/P4-s3-suspend-resume.patch (100%)
 rename local/patches/{ => legacy-superseded-2026-07-12}/kernel/redbear-consolidated.patch (100%)
 rename local/patches/{ => legacy-superseded-2026-07-12}/relibc/P3-dns-resolver-hardening.patch (100%)
 rename local/patches/{ => legacy-superseded-2026-07-12}/userutils/P5-redbear-branding.patch (100%)

diff --git a/local/patches/kernel/P4-s3-suspend-resume.patch b/local/patches/legacy-superseded-2026-07-12/kernel/P4-s3-suspend-resume.patch
similarity index 100%
rename from local/patches/kernel/P4-s3-suspend-resume.patch
rename to local/patches/legacy-superseded-2026-07-12/kernel/P4-s3-suspend-resume.patch
diff --git a/local/patches/kernel/redbear-consolidated.patch b/local/patches/legacy-superseded-2026-07-12/kernel/redbear-consolidated.patch
similarity index 100%
rename from local/patches/kernel/redbear-consolidated.patch
rename to local/patches/legacy-superseded-2026-07-12/kernel/redbear-consolidated.patch
diff --git a/local/patches/relibc/P3-dns-resolver-hardening.patch b/local/patches/legacy-superseded-2026-07-12/relibc/P3-dns-resolver-hardening.patch
similarity index 100%
rename from local/patches/relibc/P3-dns-resolver-hardening.patch
rename to local/patches/legacy-superseded-2026-07-12/relibc/P3-dns-resolver-hardening.patch
diff --git a/local/patches/userutils/P5-redbear-branding.patch b/local/patches/legacy-superseded-2026-07-12/userutils/P5-redbear-branding.patch
similarity index 100%
rename from local/patches/userutils/P5-redbear-branding.patch
rename to local/patches/legacy-superseded-2026-07-12/userutils/P5-redbear-branding.patch
diff --git a/local/sources/base b/local/sources/base
index 00b799d512..b59dffc0ff 160000
--- a/local/sources/base
+++ b/local/sources/base
@@ -1 +1 @@
-Subproject commit 00b799d512063b947cdcb32c15d36b7755eda9b3
+Subproject commit b59dffc0ff72b4cb3c691c348873ca852d751346
diff --git a/src/bin/repo_builder.rs b/src/bin/repo_builder.rs
index 399debe158..7bd2bf46a2 100644
--- a/src/bin/repo_builder.rs
+++ b/src/bin/repo_builder.rs
@@ -283,6 +283,7 @@ fn publish_packages(config: &CliConfig) -> anyhow::Result<()> {
     let repository = Repository {
         packages,
         outdated_packages,
+        build_id: String::new(),
     };
 
     let output = toml::to_string(&repository)?;