From 350c6f5ea07cb5e4102c43bd737393e8f1966c58 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Mon, 5 Feb 2024 11:26:09 +0000 Subject: [PATCH] docs: Fix git revs in README.md Signed-off-by: Nick Spinale --- README.md | 13 ++++++------- hacking/nix/scope/sources.nix | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 067a1030f..023660860 100644 --- a/README.md +++ b/README.md @@ -33,19 +33,18 @@ This work is funded by the [seL4 Foundation](https://sel4.systems/Foundation/hom This project builds upon [seL4](https://github.com/seL4/seL4) and the [seL4 Microkit](https://github.com/seL4/microkit). In particular, this project works with the following versions of those related projects: -- seL4, when used without Microkit: `1c7a0cb549021bc0781b49aa69359ee8d035981c` +- seL4, when used without Microkit: `c9989664e312d971048f687895d4917758fcfd3b` ([github.com/coliasgroup/seL4:rust](https://github.com/coliasgroup/seL4/tree/rust), an ancestor of [github.com/seL4/seL4:master](https://github.com/seL4/seL4/tree/master)). -- seL4, when used with Microkit: `7b8c552b36fe13b8a846b06a659c23697b7df926` +- seL4, when used with Microkit: `5f71dc4a5cd90b823876bec10265da92eae486ab` ([github.com/coliasgroup/seL4:rust-microkit](https://github.com/coliasgroup/seL4/tree/rust-microkit), not an ancestor of [github.com/seL4/seL4:master](https://github.com/seL4/seL4/tree/master)). For now, Microkit (both upstream trunk and the branch used by this project) requires [a - patch](https://github.com/coliasgroup/seL4/commit/7b8c552b36fe13b8a846b06a659c23697b7df926) on top + patch](https://github.com/coliasgroup/seL4/commit/5f71dc4a5cd90b823876bec10265da92eae486ab) on top of upstream seL4 trunk. -- seL4 Microkit: `004e340a38d1ed7bf9d1a0223aff8475bba6e6e8` - ([github.com/coliasgroup/microkit:rust](https://github.com/coliasgroup/microkit/tree/rust), not an - ancestor of [github.com/seL4/microkit:main](https://github.com/seL4/microkit/tree/main)). For now, - this project requires a few patches to upstream Microkit trunk which have not yet be upstreamed. +- seL4 Microkit: `e04afe55ac7f3d4242145fd7466b583fe1b1fce3` + ([github.com/coliasgroup/microkit:rust](https://github.com/coliasgroup/microkit/tree/rust), an + ancestor of [github.com/seL4/microkit:main](https://github.com/seL4/microkit/tree/main)). ### Demos diff --git a/hacking/nix/scope/sources.nix b/hacking/nix/scope/sources.nix index ff4e7af87..63dd5b23e 100644 --- a/hacking/nix/scope/sources.nix +++ b/hacking/nix/scope/sources.nix @@ -49,7 +49,7 @@ in rec { seL4 = { rust = fetchGit { url = "https://github.com/coliasgroup/seL4.git"; - rev = "2404473ed2e68c8e627cb4d6588bd57633038109"; # branch "rust" + rev = "2404473ed2e68c8e627cb4d6588bd57633038109"; # branch "rust-testing" local = localRoot + "/seL4"; };