Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-29 12:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Asterinas dependencies in OSDK

Browse Source
This commit is contained in:
Zhang Junyang
2024-02-28 16:56:09 +08:00
committed by Tate, Hongliang Tian
parent 7d0ea99650
commit 16298008fc
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osdk/src/commands/build/bin.rs
View File

@ -155,8 +155,8 @@ fn install_setup_with_arch(
cmd.arg("--root").arg(install_dir.as_ref());
// TODO: Use the latest revision when modifications on the `osdk` branch is merged.
cmd.arg("--git")
.arg("https://github.com/junyang-zh/asterinas");
cmd.arg("--branch").arg("osdk");
.arg(crate::util::ASTER_GIT_LINK);
cmd.arg("--rev").arg(crate::util::ASTER_GIT_REV);
cmd.arg("--target").arg(match arch {
SetupInstallArch::X86_64 => "x86_64-unknown-none",
SetupInstallArch::Other(path) => path.to_str().unwrap(),

6
osdk/src/commands/new/mod.rs
View File

@ -12,7 +12,7 @@ use crate::{
cli::NewArgs,
error::Errno,
error_msg,
util::{cargo_new_lib, get_cargo_metadata, ASTER_FRAME_DEP, KTEST_DEP},
util::{cargo_new_lib, get_cargo_metadata, aster_crate_dep},
};
pub fn execute_new_command(args: &NewArgs) {
@ -44,9 +44,9 @@ fn add_manifest_dependencies(cargo_metadata: &serde_json::Value, crate_name: &st
let dependencies = manifest.get_mut("dependencies").unwrap();
let aster_frame_dep = toml::Table::from_str(ASTER_FRAME_DEP).unwrap();
let aster_frame_dep = toml::Table::from_str(&aster_crate_dep("aster-frame")).unwrap();
dependencies.as_table_mut().unwrap().extend(aster_frame_dep);
let ktest_dep = toml::Table::from_str(KTEST_DEP).unwrap();
let ktest_dep = toml::Table::from_str(&aster_crate_dep("ktest")).unwrap();
dependencies.as_table_mut().unwrap().extend(ktest_dep);
// If we created a workspace by `osdk new`, we should exclude the `base` crate from the workspace.