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 14, 2025
1 parent 9e29ed9 commit e55f53e
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 22 deletions.
33 changes: 12 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,34 +1,25 @@
[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/axfeat.git".axfeat]
branch = "jailhouse"
git = "https://github.com/Starry-OS/axtask.git"
git = "https://github.com/Josen-B/axfeat.git"

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

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

[patch."https://github.com/Starry-OS//axfeat.git".axfeat]
[patch."https://github.com/Starry-OS/axstarry.git".axstarry]
branch = "jailhouse"
git = "https://github.com/Starry-OS/axfeat.git"
git = "https://github.com/Josen-B/axstarry.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//taskctx.git".taskctx]
branch = "jailhouse"
git = "https://github.com/Starry-OS/taskctx.git"
[patch."https://github.com/Starry-OS/linux_syscall_api.git".linux_syscall_api]
git = "https://github.com/Josen-B/linux_syscall_api.git"

[profile.dev]
lto = true
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
21 changes: 21 additions & 0 deletions prework.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

# 检查是否存在 crates 路径,如果不存在则创建
if [ ! -d "./crates" ]; then
echo "crates 正在创建..."
mkdir crates
kbuild patch add taskctx;
cd crates/taskctx;
git reset --hard 3c3ad2fb4defce02bc6186b836471ad28ab9c349;
cd ../..
else
echo "crates 路径已存在。"
fi

make clean;
# 使用 sed 替换 channel 的值
sed -i 's/channel = "nightly-2024-05-02"/channel = "nightly"/' rust-toolchain.toml

cargo update;

sed -i 's/channel = "nightly"/channel = "nightly-2024-05-02"/' rust-toolchain.toml

0 comments on commit e55f53e

Please sign in to comment.