From eb98abe81c5aed1d1cc31c23ee6b530c08292c70 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Thu, 27 Jun 2024 12:47:20 +0000 Subject: [PATCH 1/4] nix: Bump Microkit dependency Signed-off-by: Nick Spinale --- hacking/nix/scope/microkit/default.nix | 1 + hacking/nix/scope/sources.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hacking/nix/scope/microkit/default.nix b/hacking/nix/scope/microkit/default.nix index a273b91a0..ea5729d18 100644 --- a/hacking/nix/scope/microkit/default.nix +++ b/hacking/nix/scope/microkit/default.nix @@ -73,6 +73,7 @@ let --sel4=${kernelSourcePatched} \ --boards ${board} \ --configs ${config} \ + --skip-tool \ --skip-docs \ --skip-tar diff --git a/hacking/nix/scope/sources.nix b/hacking/nix/scope/sources.nix index 64530c131..305f3c52a 100644 --- a/hacking/nix/scope/sources.nix +++ b/hacking/nix/scope/sources.nix @@ -62,7 +62,7 @@ in rec { microkit = fetchGit { url = "https://github.com/coliasgroup/microkit.git"; - rev = "fdcccc7d4af51c35ca2992ba6839955e4b44a039"; # branch "rust-nix" + rev = "e300c3298023aad9b2d1df9c36f8229e8001a59a"; # branch "rust-nix" local = localRoot + "/microkit"; }; From bbdc4ed994f1076a74a17f15a43b68fa8481f391 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Thu, 27 Jun 2024 13:06:08 +0000 Subject: [PATCH 2/4] nix: Bump seL4 dependency Signed-off-by: Nick Spinale --- hacking/nix/scope/sources.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hacking/nix/scope/sources.nix b/hacking/nix/scope/sources.nix index 305f3c52a..a7bcae033 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 = "49a7a18466d5e73c4f22909826bf512971fc9117"; # branch "rust-testing" + rev = "c92dc2d48539a91da8280dad056b1f1692c44c07"; # branch "rust-testing" local = localRoot + "/seL4"; }; From 8ef450003f3f6372869eaf8ca250b68bc2528442 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Thu, 27 Jun 2024 13:07:15 +0000 Subject: [PATCH 3/4] nix: Fix HTTP server disk image Signed-off-by: Nick Spinale --- .../world/instances/microkit/http-server/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hacking/nix/scope/world/instances/microkit/http-server/default.nix b/hacking/nix/scope/world/instances/microkit/http-server/default.nix index 8fc8cf0b5..fe9efaa4d 100644 --- a/hacking/nix/scope/world/instances/microkit/http-server/default.nix +++ b/hacking/nix/scope/world/instances/microkit/http-server/default.nix @@ -33,8 +33,8 @@ let content = builtins.fetchGit { url = "https://github.com/seL4/website_pr_hosting"; - ref = "PR_280"; - rev = "0a579415c4837c96c4d4629e4b4d4691aaff07ca"; + ref = "gh-pages"; + rev = "e320919be95968dc13e2122d97737b02a8a31997"; }; diskImage = mkDiskImage {}; @@ -49,6 +49,9 @@ let { maxIndividualFileSize ? null , excludePatterns ? null }: + let + contentSubdir = "PR_371"; + in vmTools.runInLinuxVM (runCommand "disk-image" { nativeBuildInputs = [ python3 kmod parted fatresize dosfstools ]; preVM = '' @@ -87,7 +90,7 @@ let # HACK: # - some filesystem layer doesn't seem to like '?' in filename # - rsync doesn't play nicely with some filesystem layer - cp -r --no-preserve=owner,mode ${content}/localhost x/ + cp -r --no-preserve=owner,mode ${content}/${contentSubdir} x/ find x/ -name '*\?' -delete ${lib.optionalString (excludePatterns != null) '' find x/ -type f \( ${ @@ -109,7 +112,7 @@ let # NOTE # Somehow $partition sometimes ends up smaller than $partition_size. # conv=notrunc works around this possibility. - fatresize -v -s $partition_size $partition + fatresize -vf -s $partition_size $partition real_img=real-disk.img touch $real_img From 886061d72f13f928ffec29b897c14f44bcf7befa Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Thu, 27 Jun 2024 13:34:23 +0000 Subject: [PATCH 4/4] docs: Update commit hashes in README.md Signed-off-by: Nick Spinale --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fb42b0f96..fdace17b1 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,13 @@ Microkit](https://github.com/seL4/microkit). In particular, this project works w following versions of those related projects: - seL4, when used without Microkit: - [`ddeb18a015199a28393d654ad8349788ab492d8a`](https://github.com/seL4/seL4/tree/ddeb18a015199a28393d654ad8349788ab492d8a) + [`c28e52a1ece2020723d1857c893e75897559563e`](https://github.com/seL4/seL4/tree/c28e52a1ece2020723d1857c893e75897559563e) (on [github.com/seL4/seL4:master](https://github.com/seL4/seL4/tree/master)) - seL4, when used with Microkit: [`57975d485397ce1744f7163644dd530560d0b7ec`](https://github.com/seL4/seL4/tree/57975d485397ce1744f7163644dd530560d0b7ec) (on [github.com/seL4/seL4:microkit](https://github.com/seL4/seL4/tree/microkit)) - seL4 Microkit: - [`0cdcd54ed4b2152678c4312e738b9b1830046234`](https://github.com/seL4/microkit/tree/0cdcd54ed4b2152678c4312e738b9b1830046234) + [`e300c3298023aad9b2d1df9c36f8229e8001a59a`](https://github.com/seL4/microkit/tree/e300c3298023aad9b2d1df9c36f8229e8001a59a) (on [github.com/seL4/microkit:main](https://github.com/seL4/microkit/tree/main)) ### Demos