Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #158

Merged
merged 4 commits into from
Jun 27, 2024
Merged

Update dependencies #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb98abe
nix: Bump Microkit dependency
nspin Jun 27, 2024
bbdc4ed
nix: Bump seL4 dependency
nspin Jun 27, 2024
8ef4500
nix: Fix HTTP server disk image
nspin Jun 27, 2024
886061d
docs: Update commit hashes in README.md
nspin Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions hacking/nix/scope/microkit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ let
--sel4=${kernelSourcePatched} \
--boards ${board} \
--configs ${config} \
--skip-tool \
--skip-docs \
--skip-tar

Expand Down
4 changes: 2 additions & 2 deletions hacking/nix/scope/sources.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};

Expand All @@ -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";
};

Expand Down
11 changes: 7 additions & 4 deletions hacking/nix/scope/world/instances/microkit/http-server/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand All @@ -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 = ''
Expand Down Expand Up @@ -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 \( ${
Expand All @@ -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
Expand Down
Loading