From 34f563826da31d84d22edd09a3d4f4d3fdebff75 Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Thu, 30 Apr 2026 00:34:38 +0100
Subject: [PATCH] feat: source archival system + persistent recipe wiring

- archive-sources.sh: exports fully-patched source archives as
  category-pkgname-vVERSION-patched.tar.gz with recipe.toml
- Integrated into build-redbear.sh (runs after every successful build)
- Versions extracted from: explicit rev=, tar URL, or git HEAD
- integrate-redbear.sh: added all missing local recipe symlinks
  (breeze, kde-cli-tools, kdecoration, kirigami, plasma-*, wayland/*,
  redbear-compositor, redbear-passwd, redox-drm, amdgpu, tests/*)
- 210 archives generated, 171 packages in manifest
- All 12 I2C/GPIO/UCSI drivers verified in base archive
---
 local/scripts/archive-sources.sh   | 163 +++++++++++++++++++++++++++++
 local/scripts/build-redbear.sh     |   5 +
 local/scripts/integrate-redbear.sh |  18 ++++
 3 files changed, 186 insertions(+)
 create mode 100755 local/scripts/archive-sources.sh

diff --git a/local/scripts/archive-sources.sh b/local/scripts/archive-sources.sh
new file mode 100755
index 00000000..3994ab23
--- /dev/null
+++ b/local/scripts/archive-sources.sh
@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+# archive-sources.sh — Export fully-patched source archives for Red Bear OS.
+#
+# Usage:
+#   ./local/scripts/archive-sources.sh [--all] [--recipe <path>] [--target <triple>]
+#
+# Creates versioned, fully-patched source archives in sources/<target>/:
+#   <category>-<pkgname>-v<version>-patched.tar.gz
+#
+# Each archive contains: source/ (fully patched) + recipe.toml
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+TARGET="${TARGET:-x86_64-unknown-redox}"
+SOURCES_DIR="${PROJECT_ROOT}/sources/${TARGET}"
+MANIFEST="${SOURCES_DIR}/packages.txt"
+
+mkdir -p "${SOURCES_DIR}"
+
+GREEN='\033[1;32m'
+RED='\033[1;31m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+status()  { echo -e "${GREEN}==>${NC} $*"; }
+warn()   { echo -e "${YELLOW}WARN${NC}: $*"; }
+err()    { echo -e "${RED}ERROR${NC}: $*" >&2; }
+
+extract_version() {
+    local recipe="$1"
+    local recipe_dir
+    recipe_dir=$(dirname "$recipe")
+    local ver=""
+
+    # Try tar URL version extraction
+    ver=$(grep -oP 'tar\s*=\s*".*?/[\w-]+-(\d+\.\d+(?:\.\d+)?)\.tar' "$recipe" 2>/dev/null | grep -oP '\d+\.\d+(?:\.\d+)?' | head -1)
+    if [ -n "$ver" ]; then
+        echo "$ver"
+        return
+    fi
+
+    # Try explicit rev field
+    ver=$(grep -oP 'rev\s*=\s*"([a-f0-9]+)"' "$recipe" 2>/dev/null | grep -oP '[a-f0-9]{7,}' | head -1)
+    if [ -n "$ver" ]; then
+        echo "${ver:0:7}"
+        return
+    fi
+
+    # Try git HEAD if source directory exists with .git
+    local source_dir="${recipe_dir}/source"
+    if [ -d "${source_dir}/.git" ]; then
+        ver=$(git -C "$source_dir" rev-parse --short HEAD 2>/dev/null)
+        if [ -n "$ver" ]; then
+            echo "$ver"
+            return
+        fi
+    fi
+
+    # Fallback
+    echo "unknown"
+}
+
+extract_pkgname() {
+    local recipe_dir="$1"
+    basename "$recipe_dir"
+}
+
+extract_category() {
+    local recipe_dir="$1"
+    # recipe_dir is like recipes/core/base or local/recipes/system/redbear-authd
+    # Extract the category (parent of pkgname)
+    local parent
+    parent=$(dirname "$recipe_dir")
+    basename "$parent"
+}
+
+archive_recipe() {
+    local recipe_dir="$1"
+    local recipe="${recipe_dir}/recipe.toml"
+
+    if [ ! -f "$recipe" ]; then
+        warn "No recipe.toml at $recipe_dir — skipping"
+        return 1
+    fi
+
+    local pkgname version category archive_name
+    pkgname=$(extract_pkgname "$recipe_dir")
+    version=$(extract_version "$recipe")
+    category=$(extract_category "$recipe_dir")
+    archive_name="${category}-${pkgname}-v${version}-patched.tar.gz"
+    local archive_path="${SOURCES_DIR}/${archive_name}"
+
+    # Check if source directory exists
+    local source_dir="${recipe_dir}/source"
+    if [ ! -d "$source_dir" ]; then
+        warn "No source/ in $recipe_dir — skipping (may be a meta-package)"
+        return 1
+    fi
+
+    # Create archive with source + recipe
+    status "Archiving ${pkgname} v${version}..."
+    if tar -czf "$archive_path" -C "$(dirname "$recipe_dir")" "$(basename "$recipe_dir")/source" "$(basename "$recipe_dir")/recipe.toml" 2>/dev/null; then
+        local size
+        size=$(du -h "$archive_path" | cut -f1)
+        echo -e "  ${GREEN}✓${NC} ${archive_name} (${size})"
+        echo "${archive_name}" >> "$MANIFEST"
+        return 0
+    else
+        err "Failed to archive ${pkgname}"
+        return 1
+    fi
+}
+
+archive_all() {
+    > "$MANIFEST"
+    local count=0 failed=0 skipped=0
+
+    # Find all recipe directories with recipe.toml files
+    while IFS= read -r -d '' recipe_file; do
+        local recipe_dir
+        recipe_dir=$(dirname "$recipe_file")
+
+        # Skip if already in sources/ (avoid double-archiving)
+        local pkgname
+        pkgname=$(basename "$recipe_dir")
+
+        if archive_recipe "$recipe_dir"; then
+            count=$((count + 1))
+        else
+            failed=$((failed + 1))
+        fi
+    done < <(find "${PROJECT_ROOT}/recipes" "${PROJECT_ROOT}/local/recipes" -name "recipe.toml" -print0 2>/dev/null)
+
+    echo ""
+    status "Archive complete: ${count} packages, ${failed} failures"
+}
+
+# ── Main ────────────────────────────────────────────────────────────
+
+case "${1:-}" in
+    --recipe)
+        if [ -z "${2:-}" ]; then
+            err "--recipe requires a path"
+            exit 1
+        fi
+        > "$MANIFEST"
+        archive_recipe "${PROJECT_ROOT}/${2}"
+        ;;
+    --all)
+        archive_all
+        ;;
+    *)
+        echo "Usage: $0 --all | --recipe <path>"
+        echo ""
+        echo "  --all           Archive all recipes with source directories"
+        echo "  --recipe PATH   Archive a specific recipe (e.g. recipes/core/base)"
+        echo ""
+        echo "  Environment: TARGET=x86_64-unknown-redox (default)"
+        exit 1
+        ;;
+esac
diff --git a/local/scripts/build-redbear.sh b/local/scripts/build-redbear.sh
index 2e416425..38ad1a4f 100755
--- a/local/scripts/build-redbear.sh
+++ b/local/scripts/build-redbear.sh
@@ -217,6 +217,11 @@ else
     REPO_OFFLINE=1 COOKBOOK_OFFLINE=true CI=1 make all "CONFIG_NAME=$CONFIG" "JOBS=$JOBS"
 fi
 
+# Archive fully-patched source packages for reproducibility
+echo ""
+echo ">>> Archiving fully-patched source packages..."
+"$SCRIPT_DIR/archive-sources.sh" --all 2>/dev/null || echo "    (archive step skipped — run manually with: local/scripts/archive-sources.sh --all)"
+
 ARCH="${ARCH:-$(uname -m)}"
 echo ""
 echo "========================================"
diff --git a/local/scripts/integrate-redbear.sh b/local/scripts/integrate-redbear.sh
index 60b9f3d4..9e86e652 100755
--- a/local/scripts/integrate-redbear.sh
+++ b/local/scripts/integrate-redbear.sh
@@ -209,6 +209,24 @@ symlink "../../local/recipes/kde/kf6-kwayland" "recipes/kde/kf6-kwayland"
 symlink "../../local/recipes/kde/kf6-knewstuff" "recipes/kde/kf6-knewstuff"
 symlink "../../local/recipes/kde/kf6-kwallet" "recipes/kde/kf6-kwallet"
 symlink "../../local/recipes/kde/kf6-prison" "recipes/kde/kf6-prison"
+symlink "../../local/recipes/kde/breeze" "recipes/kde/breeze"
+symlink "../../local/recipes/kde/kde-cli-tools" "recipes/kde/kde-cli-tools"
+symlink "../../local/recipes/kde/kdecoration" "recipes/kde/kdecoration"
+symlink "../../local/recipes/kde/kirigami" "recipes/kde/kirigami"
+symlink "../../local/recipes/kde/kwin" "recipes/kde/kwin"
+symlink "../../local/recipes/kde/plasma-desktop" "recipes/kde/plasma-desktop"
+symlink "../../local/recipes/kde/plasma-framework" "recipes/kde/plasma-framework"
+symlink "../../local/recipes/kde/plasma-workspace" "recipes/kde/plasma-workspace"
+symlink "../../local/recipes/kde/plasma-wayland-protocols" "recipes/kde/plasma-wayland-protocols"
+symlink "../../local/recipes/kde/kglobalacceld" "recipes/kde/kglobalacceld"
+symlink "../../local/recipes/wayland/qt6-wayland-smoke" "recipes/wayland/qt6-wayland-smoke"
+symlink "../../local/recipes/wayland/seatd-redox" "recipes/wayland/seatd-redox"
+symlink "../../local/recipes/wayland/smallvil" "recipes/wayland/smallvil"
+symlink "../../local/recipes/wayland/redbear-compositor" "recipes/wayland/redbear-compositor"
+symlink "../../local/recipes/tests/redox-drm-prime-test" "recipes/tests/redox-drm-prime-test"
+symlink "../../local/recipes/system/redbear-passwd" "recipes/system/redbear-passwd"
+symlink "../../local/recipes/gpu/redox-drm" "recipes/gpu/redox-drm"
+symlink "../../local/recipes/gpu/amdgpu" "recipes/gpu/amdgpu"
 status "Custom recipe symlinks ready"
 echo ""