Skip to content

Commit

Permalink
fix support jailhouse
Browse files Browse the repository at this point in the history
  • Loading branch information
Josen-B committed Jan 15, 2025
1 parent 9e29ed9 commit 783c41d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 22 deletions.
34 changes: 14 additions & 20 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
[patch."https://github.com/Starry-OS//kernel_guard.git".kernel_guard]
[patch."https://github.com/Starry-OS/axdriver.git".axdriver]
branch = "jailhouse"
git = "https://github.com/Starry-OS/kernel_guard.git"
git = "https://github.com/Josen-B/axdriver.git"

[patch."https://github.com/Starry-OS//axtask.git".axtask]
[patch."https://github.com/Starry-OS/axprocess.git".axprocess]
branch = "jailhouse"
git = "https://github.com/Starry-OS/axtask.git"
git = "https://github.com/Josen-B/axprocess.git"

[patch."https://github.com/Starry-OS//axfs.git".axfs]
[patch."https://github.com/Starry-OS/axruntime.git".axruntime]
branch = "jailhouse"
git = "https://github.com/Starry-OS/axfs.git"
git = "https://github.com/Josen-B/axruntime.git"

[patch."https://github.com/Starry-OS//axhal.git".axhal]
[patch."https://github.com/Starry-OS/axstarry.git".axstarry]
branch = "jailhouse"
git = "https://github.com/Josen-B/axhal.git"
git = "https://github.com/Josen-B/axstarry.git"

[patch."https://github.com/Starry-OS//axfeat.git".axfeat]
[patch."https://github.com/Starry-OS/taskctx.git".taskctx]
branch = "jailhouse"
git = "https://github.com/Starry-OS/axfeat.git"
git = "https://github.com/Josen-B/taskctx.git"

[patch."https://github.com/Starry-OS//axprocess.git".axprocess]
branch = "jailhouse"
git = "https://github.com/Starry-OS/axprocess.git"

[patch."https://github.com/Starry-OS//axruntime.git".axruntime]
branch = "jailhouse"
git = "https://github.com/Starry-OS/axruntime.git"
[patch."https://github.com/Starry-OS/linux_syscall_api.git".linux_syscall_api]
git = "https://github.com/Josen-B/linux_syscall_api.git"

[patch."https://github.com/Starry-OS//taskctx.git".taskctx]
branch = "jailhouse"
git = "https://github.com/Starry-OS/taskctx.git"
[patch."https://github.com/Starry-OS/axconfig.git".axconfig]
git = "https://github.com/Josen-B/axconfig.git"

[profile.dev]
lto = true
Expand Down
2 changes: 1 addition & 1 deletion apps/monolithic_userboot/src/batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const UNIX_TESTCASES: &[&str] = &["busybox sh ./unixbench_testcode.sh"];
const CYCLE_TESTCASES: &[&str] = &["busybox sh ./cyclictest_testcode.sh"];

#[allow(dead_code)]
const OTHER_TESTCASES: &[&str] = &["busybox sh"];
const OTHER_TESTCASES: &[&str] = &["./helloworld"];

#[allow(unused)]
pub fn run_batch_testcases() {
Expand Down
2 changes: 1 addition & 1 deletion build_img.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# default setting
arch=x86_64
fs=fat32
size=30
size=10
FILE=

display_help()
Expand Down

0 comments on commit 783c41d

Please sign in to comment.