Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-08 21:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the test kernel to OSDK/deps

Browse Source
This commit is contained in:
Zhang Junyang 2025-01-04 19:43:50 +08:00 committed by Tate, Hongliang Tian
parent 455b8abba0
commit 9c430b9901
10 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,7 +1,7 @@
[workspace] [workspace]
resolver = "2" resolver = "2"
members = [ members = [
"osdk/test-kernel", "osdk/deps/test-kernel",
"ostd", "ostd",
"ostd/libs/align_ext", "ostd/libs/align_ext",
"ostd/libs/ostd-macros", "ostd/libs/ostd-macros",

2
Makefile
View File

@ -144,7 +144,7 @@ NON_OSDK_CRATES := \
# In contrast, OSDK crates depend on OSTD (or being `ostd` itself) # In contrast, OSDK crates depend on OSTD (or being `ostd` itself)
# and need to be built or tested with OSDK. # and need to be built or tested with OSDK.
OSDK_CRATES := \ OSDK_CRATES := \
osdk/test-kernel \ osdk/deps/test-kernel \
ostd \ ostd \
ostd/libs/linux-bzimage/setup \ ostd/libs/linux-bzimage/setup \
kernel \ kernel \

4
osdk/deps/README.md Normal file
View File

@ -0,0 +1,4 @@
# OSDK deps
This directory contains libraries or kernels that depends on OSTD, independent
to OSTD but by-default shipped with OSDK.

2
osdk/test-kernel/Cargo.toml → osdk/deps/test-kernel/Cargo.toml
View File

@ -9,7 +9,7 @@ repository ="https://github.com/asterinas/asterinas"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
ostd = { version = "0.11.3", path = "../../ostd" } ostd = { version = "0.11.3", path = "../../../ostd" }
owo-colors = "4.0.0" owo-colors = "4.0.0"
[lints] [lints]

0
osdk/test-kernel/src/lib.rs → osdk/deps/test-kernel/src/lib.rs
View File

0
osdk/test-kernel/src/path.rs → osdk/deps/test-kernel/src/path.rs
View File

0
osdk/test-kernel/src/tree.rs → osdk/deps/test-kernel/src/tree.rs
View File

2
osdk/src/base_crate/mod.rs
View File

@ -228,7 +228,7 @@ fn add_manifest_dependency(
let dep_str = match option_env!("OSDK_LOCAL_DEV") { let dep_str = match option_env!("OSDK_LOCAL_DEV") {
Some("1") => { Some("1") => {
let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let test_kernel_dir = crate_dir.join("test-kernel"); let test_kernel_dir = crate_dir.join("deps").join("test-kernel");
format!( format!(
"osdk-test-kernel = {{ path = \"{}\" }}", "osdk-test-kernel = {{ path = \"{}\" }}",
test_kernel_dir.display() test_kernel_dir.display()

2
tools/bump_version.sh
View File

@ -110,7 +110,7 @@ LINUX_BOOT_PARAMS_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/boot-
LINUX_BZIMAGE_BUILDER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/builder/Cargo.toml LINUX_BZIMAGE_BUILDER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/builder/Cargo.toml
LINUX_BZIMAGE_SETUP_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/setup/Cargo.toml LINUX_BZIMAGE_SETUP_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/setup/Cargo.toml
OSDK_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/Cargo.toml OSDK_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/Cargo.toml
OSDK_TEST_RUNNER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/test-kernel/Cargo.toml OSDK_TEST_RUNNER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/deps/test-kernel/Cargo.toml
VERSION_PATH=${ASTER_SRC_DIR}/VERSION VERSION_PATH=${ASTER_SRC_DIR}/VERSION
current_version=$(cat ${VERSION_PATH}) current_version=$(cat ${VERSION_PATH})

2
tools/github_workflows/publish_osdk_and_ostd.sh
View File

@ -83,7 +83,7 @@ for TARGET in $TARGETS; do
do_publish_for ostd/libs/ostd-test $TARGET do_publish_for ostd/libs/ostd-test $TARGET
do_publish_for ostd/libs/linux-bzimage/setup $TARGET do_publish_for ostd/libs/linux-bzimage/setup $TARGET
do_publish_for ostd $TARGET do_publish_for ostd $TARGET
do_publish_for osdk/test-kernel $TARGET do_publish_for osdk/deps/test-kernel $TARGET
# For actual publishing, we should only publish once. Using any target that # For actual publishing, we should only publish once. Using any target that
# OSTD supports is OK. Here we use the first target in the list. # OSTD supports is OK. Here we use the first target in the list.