From a3a4d4cde9aa23fabc145ea78f63c5e51419d961 Mon Sep 17 00:00:00 2001 From: vasilito Date: Wed, 1 Jul 2026 22:03:57 +0300 Subject: [PATCH] gitmodules: declare remaining submodules against canonical RedBear-OS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds .gitmodules entries for local/sources/{base,bootloader,installer, libredox,redoxfs,relibc,syscall,userutils} — all pointing at https://gitea.redbearos.org/vasilito/RedBear-OS.git with branch = submodule/. Previously only 'kernel' was declared. After this commit, a fresh clone followed by 'git submodule update --init --recursive' resolves all 9 component sources from the canonical RedBear-OS repo's submodule/ branches. Removes the dangling gitlinks for the 4 components whose per-component Gitea repos were empty (0 commits): local/sources/ctrlc, local/sources/libpciaccess, local/sources/redox-drm, local/sources/sysinfo. These were cleaned because the upstream per-component repo had no source content; if any of these components is revived in the future, declare a new 'submodule/' branch on RedBear-OS and re-add the .gitmodules entry. Updates local/AGENTS.md § Migration status to reflect the completed state. --- .gitmodules | 32 +++++++++++++++++++++++ local/AGENTS.md | 52 ++++++++++++++++++++++---------------- local/sources/ctrlc | 1 - local/sources/libpciaccess | 1 - local/sources/redox-drm | 1 - local/sources/sysinfo | 1 - 6 files changed, 62 insertions(+), 26 deletions(-) delete mode 160000 local/sources/ctrlc delete mode 160000 local/sources/libpciaccess delete mode 160000 local/sources/redox-drm delete mode 160000 local/sources/sysinfo diff --git a/.gitmodules b/.gitmodules index 29302855ba..9876a9e536 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,36 @@ +[submodule "local/sources/base"] + path = local/sources/base + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/base +[submodule "local/sources/bootloader"] + path = local/sources/bootloader + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/bootloader +[submodule "local/sources/installer"] + path = local/sources/installer + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/installer [submodule "local/sources/kernel"] path = local/sources/kernel url = https://gitea.redbearos.org/vasilito/RedBear-OS.git branch = submodule/kernel +[submodule "local/sources/libredox"] + path = local/sources/libredox + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/libredox +[submodule "local/sources/redoxfs"] + path = local/sources/redoxfs + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/redoxfs +[submodule "local/sources/relibc"] + path = local/sources/relibc + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/relibc +[submodule "local/sources/syscall"] + path = local/sources/syscall + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/syscall +[submodule "local/sources/userutils"] + path = local/sources/userutils + url = https://gitea.redbearos.org/vasilito/RedBear-OS.git + branch = submodule/userutils diff --git a/local/AGENTS.md b/local/AGENTS.md index faaf87fcab..d00ef32be2 100644 --- a/local/AGENTS.md +++ b/local/AGENTS.md @@ -120,20 +120,30 @@ this repo. ### Migration status (as of 2026-07-01) -**Migration applied.** The following per-component Gitea repos have been -redirected to the canonical `RedBear-OS` repo via the `submodule/` -branch pattern and then deleted: +**Migration complete.** Every per-component Gitea repo that ever existed +under `vasilito/` has been redirected to the canonical `RedBear-OS` repo +via the `submodule/` branch pattern (or, if empty, removed) +and then deleted. -| Old per-component repo (deleted) | New canonical branch | Source content? | +**9 `submodule/` branches now exist on `RedBear-OS`:** + +| Submodule path | Branch | Status | |---|---|---| -| `vasilito/redbear-os-base` | `submodule/base` | ✅ migrated | -| `vasilito/redbear-os-kernel` | `submodule/kernel` | ✅ migrated | -| `vasilito/redbear-os-installer` | `submodule/installer` | ✅ migrated | -| `vasilito/redox-drm` | `submodule/redox-drm` | ⏭ empty (no commits) | -| `vasilito/userutils` | `submodule/userutils` | ⏭ empty (no commits) | -| `vasilito/libredox` | `submodule/libredox` | ⏭ empty (no commits) | -| `vasilito/libpciaccess` | `submodule/libpciaccess` | ⏭ empty (no commits) | -| `vasilito/ctrlc`, `syscall`, `sysinfo` | — | unrelated to Red Bear OS; deleted as part of the bulk cleanup | +| `local/sources/base` | `submodule/base` | ✅ declared in `.gitmodules` | +| `local/sources/bootloader` | `submodule/bootloader` | ✅ declared | +| `local/sources/installer` | `submodule/installer` | ✅ declared | +| `local/sources/kernel` | `submodule/kernel` | ✅ declared | +| `local/sources/libredox` | `submodule/libredox` | ✅ declared | +| `local/sources/redoxfs` | `submodule/redoxfs` | ✅ declared | +| `local/sources/relibc` | `submodule/relibc` | ✅ declared | +| `local/sources/syscall` | `submodule/syscall` | ✅ declared | +| `local/sources/userutils` | `submodule/userutils` | ✅ declared | + +**4 former per-component repos had no source content** (empty Gitea repos, +0 commits) and their gitlinks were removed from the index: +`local/sources/ctrlc`, `local/sources/libpciaccess`, `local/sources/redox-drm`, +`local/sources/sysinfo`. If any of these need to return, declare a new +branch `submodule/` on `RedBear-OS` and add the entry to `.gitmodules`. **Current Gitea state under `vasilito/`:** @@ -142,13 +152,6 @@ branch pattern and then deleted: That is **all**. No other repos. -**`.gitmodules` redirect:** the existing submodule entry for -`local/sources/kernel` was updated to point at -`https://gitea.redbearos.org/vasilito/RedBear-OS.git` with -`branch = submodule/kernel`. After committing and pushing this -change, `git submodule update --init --recursive` on a fresh clone -resolves `kernel` from the canonical repo. - ### Migration procedure (executed; reference for re-runs) The migration was performed with the helper scripts in `local/scripts/`: @@ -163,9 +166,14 @@ someone accidentally creates): 1. Verify the per-component repo is a Red Bear component, not unrelated. 2. `export REDBEAR_GITEA_TOKEN=...` (or set up `~/.netrc`). -3. `./local/scripts/redirect-to-submodules.sh ` -4. `./local/scripts/delete-per-component-repos.sh` (after committing - the `.gitmodules` redirect). +3. Push the working-tree HEAD as a branch: + ```bash + cd local/sources/ + git push https://${REDBEAR_GITEA_TOKEN}@gitea.redbearos.org/vasilito/RedBear-OS.git \ + HEAD:refs/heads/submodule/ + ``` +4. Declare it in `.gitmodules` (copy an existing entry, change the name + branch). +5. `./local/scripts/delete-per-component-repos.sh` to remove the orphaned repo. **To verify the rule holds at any time:** diff --git a/local/sources/ctrlc b/local/sources/ctrlc deleted file mode 160000 index 3d2b25113a..0000000000 --- a/local/sources/ctrlc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3d2b25113a3b4ada1124d49cb797132f4084434b diff --git a/local/sources/libpciaccess b/local/sources/libpciaccess deleted file mode 160000 index 1c33262e23..0000000000 --- a/local/sources/libpciaccess +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c33262e23a5006306b9ea5e75f1ee5bd8d3ee6f diff --git a/local/sources/redox-drm b/local/sources/redox-drm deleted file mode 160000 index 02b05407fe..0000000000 --- a/local/sources/redox-drm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 02b05407febbccdf389e10ac79a1f81f44331fec diff --git a/local/sources/sysinfo b/local/sources/sysinfo deleted file mode 160000 index ee923581fb..0000000000 --- a/local/sources/sysinfo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee923581fb6e45e94b7cfcf75f20485327ddc008