Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-09 05:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename the path of dependent crates

Browse Source
This commit is contained in:
Jianfeng Jiang 2023-12-26 02:50:01 +00:00 committed by Tate, Hongliang Tian
parent 632b1937c5
commit 7b7e3c4b7a
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -796,7 +796,7 @@ dependencies = [
[[package]] [[package]]
name = "inherit-methods-macro" name = "inherit-methods-macro"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/jinzhao-dev/inherit-methods-macro?rev=98f7e3e#98f7e3eb9efdac98faf5a7076f154f30894b9b02" source = "git+https://github.com/asterinas/inherit-methods-macro?rev=98f7e3e#98f7e3eb9efdac98faf5a7076f154f30894b9b02"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -918,7 +918,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]] [[package]]
name = "libflate" name = "libflate"
version = "1.4.0" version = "1.4.0"
source = "git+https://github.com/jinzhao-dev/libflate?rev=b781da6#b781da6b6841e380f4cfa3529d5070afad56ea32" source = "git+https://github.com/asterinas/libflate?rev=b781da6#b781da6b6841e380f4cfa3529d5070afad56ea32"
dependencies = [ dependencies = [
"adler32", "adler32",
"core2", "core2",
@ -929,7 +929,7 @@ dependencies = [
[[package]] [[package]]
name = "libflate_lz77" name = "libflate_lz77"
version = "1.2.0" version = "1.2.0"
source = "git+https://github.com/jinzhao-dev/libflate?rev=b781da6#b781da6b6841e380f4cfa3529d5070afad56ea32" source = "git+https://github.com/asterinas/libflate?rev=b781da6#b781da6b6841e380f4cfa3529d5070afad56ea32"
dependencies = [ dependencies = [
"core2", "core2",
"hashbrown 0.13.2", "hashbrown 0.13.2",
@ -1059,7 +1059,7 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]] [[package]]
name = "pod" name = "pod"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/jinzhao-dev/pod?rev=d7dba56#d7dba56cc202a10d483b60aba4f734b1f49cb37b" source = "git+https://github.com/asterinas/pod?rev=d7dba56#d7dba56cc202a10d483b60aba4f734b1f49cb37b"
dependencies = [ dependencies = [
"pod-derive", "pod-derive",
] ]
@ -1067,7 +1067,7 @@ dependencies = [
[[package]] [[package]]
name = "pod-derive" name = "pod-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/jinzhao-dev/pod?rev=d7dba56#d7dba56cc202a10d483b60aba4f734b1f49cb37b" source = "git+https://github.com/asterinas/pod?rev=d7dba56#d7dba56cc202a10d483b60aba4f734b1f49cb37b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1428,7 +1428,7 @@ dependencies = [
[[package]] [[package]]
name = "trapframe" name = "trapframe"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/jinzhao-dev/trapframe-rs?rev=9758a83#9758a83f769c8f4df35413c7ad28ef42c270187e" source = "git+https://github.com/asterinas/trapframe-rs?rev=2f37590#2f375901398508edb554deb2f84749153a59bb4a"
dependencies = [ dependencies = [
"log", "log",
"pod", "pod",

6
framework/aster-frame/Cargo.toml
View File

@ -13,17 +13,17 @@ bitvec = { version = "1.0", default-features = false, features = ["alloc"] }
buddy_system_allocator = "0.9.0" buddy_system_allocator = "0.9.0"
cfg-if = "1.0" cfg-if = "1.0"
gimli = { version = "0.28", default-features = false, features = ["read-core"] } gimli = { version = "0.28", default-features = false, features = ["read-core"] }
inherit-methods-macro = { git = "https://github.com/jinzhao-dev/inherit-methods-macro", rev = "98f7e3e" } inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-macro", rev = "98f7e3e" }
int-to-c-enum = { path = "../../services/libs/int-to-c-enum" } int-to-c-enum = { path = "../../services/libs/int-to-c-enum" }
intrusive-collections = "0.9.5" intrusive-collections = "0.9.5"
ktest = { path = "../libs/ktest" } ktest = { path = "../libs/ktest" }
lazy_static = { version = "1.0", features = ["spin_no_std"] } lazy_static = { version = "1.0", features = ["spin_no_std"] }
log = "0.4" log = "0.4"
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "d7dba56" } pod = { git = "https://github.com/asterinas/pod", rev = "d7dba56" }
spin = "0.9.4" spin = "0.9.4"
static_assertions = "1.1.0" static_assertions = "1.1.0"
tdx-guest = { path = "../libs/tdx-guest", optional = true } tdx-guest = { path = "../libs/tdx-guest", optional = true }
trapframe = { git = "https://github.com/jinzhao-dev/trapframe-rs", rev = "9758a83" } trapframe = { git = "https://github.com/asterinas/trapframe-rs", rev = "2f37590" }
unwinding = { version = "0.2.1", default-features = false, features = ["fde-static", "hide-trace", "panic", "personality", "unwinder"] } unwinding = { version = "0.2.1", default-features = false, features = ["fde-static", "hide-trace", "panic", "personality", "unwinder"] }
volatile = { version = "0.4.5", features = ["unstable"] } volatile = { version = "0.4.5", features = ["unstable"] }

2
regression/Makefile
View File

@ -39,7 +39,7 @@ $(INITRAMFS)/lib/x86_64-linux-gnu:
@cp -L /lib/x86_64-linux-gnu/libz.so.1 $@ @cp -L /lib/x86_64-linux-gnu/libz.so.1 $@
@cp -L /usr/local/benchmark/iperf/lib/libiperf.so.0 $@ @cp -L /usr/local/benchmark/iperf/lib/libiperf.so.0 $@
@# TODO: use a custom compiled vdso.so file in the future. @# TODO: use a custom compiled vdso.so file in the future.
@git clone https://github.com/jinzhao-dev/linux_vdso.git @git clone https://github.com/asterinas/linux_vdso.git
@cd ./linux_vdso && git checkout 2a6d2db 2>/dev/null @cd ./linux_vdso && git checkout 2a6d2db 2>/dev/null
@cp -L ./linux_vdso/vdso64.so $@ @cp -L ./linux_vdso/vdso64.so $@
@rm -rf ./linux_vdso @rm -rf ./linux_vdso

2
regression/syscall_test/Makefile
View File

@ -33,7 +33,7 @@ $(BIN_DIR): $(SRC_DIR)
$(SRC_DIR): $(SRC_DIR):
@rm -rf $@ && mkdir -p $@ @rm -rf $@ && mkdir -p $@
@cd $@ && git clone -b 20200921.0 https://github.com/jinzhao-dev/gvisor.git . @cd $@ && git clone -b 20200921.0 https://github.com/asterinas/gvisor.git .
endif endif
$(TARGET_DIR): $(RUN_BASH) $(BLOCK_LIST) $(TARGET_DIR): $(RUN_BASH) $(BLOCK_LIST)

2
services/comps/network/Cargo.toml
View File

@ -13,7 +13,7 @@ aster-rights = { path = "../../libs/aster-rights" }
align_ext = { path = "../../../framework/libs/align_ext" } align_ext = { path = "../../../framework/libs/align_ext" }
int-to-c-enum = { path = "../../libs/int-to-c-enum" } int-to-c-enum = { path = "../../libs/int-to-c-enum" }
bytes = { version = "1.4.0", default-features = false } bytes = { version = "1.4.0", default-features = false }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "d7dba56" } pod = { git = "https://github.com/asterinas/pod", rev = "d7dba56" }
bitflags = "1.3" bitflags = "1.3"
spin = "0.9.4" spin = "0.9.4"
ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] } ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] }

2
services/comps/virtio/Cargo.toml
View File

@ -19,7 +19,7 @@ aster-frame = { path = "../../../framework/aster-frame" }
aster-util = { path = "../../libs/aster-util" } aster-util = { path = "../../libs/aster-util" }
aster-rights = { path = "../../libs/aster-rights" } aster-rights = { path = "../../libs/aster-rights" }
typeflags-util = { path = "../../libs/typeflags-util" } typeflags-util = { path = "../../libs/typeflags-util" }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "d7dba56" } pod = { git = "https://github.com/asterinas/pod", rev = "d7dba56" }
component = { path = "../../libs/comp-sys/component" } component = { path = "../../libs/comp-sys/component" }
log = "0.4" log = "0.4"
bit_field = "0.10.1" bit_field = "0.10.1"

4
services/libs/aster-std/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2021"
[dependencies] [dependencies]
aster-frame = { path = "../../../framework/aster-frame" } aster-frame = { path = "../../../framework/aster-frame" }
align_ext = { path = "../../../framework/libs/align_ext" } align_ext = { path = "../../../framework/libs/align_ext" }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "d7dba56" } pod = { git = "https://github.com/asterinas/pod", rev = "d7dba56" }
aster-input = { path = "../../comps/input" } aster-input = { path = "../../comps/input" }
aster-block = { path = "../../comps/block" } aster-block = { path = "../../comps/block" }
aster-network = { path = "../../comps/network" } aster-network = { path = "../../comps/network" }
@ -52,7 +52,7 @@ bitflags = "1.3"
ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] } ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] }
keyable-arc = { path = "../keyable-arc" } keyable-arc = { path = "../keyable-arc" }
# unzip initramfs # unzip initramfs
libflate = { git = "https://github.com/jinzhao-dev/libflate", rev = "b781da6", features = [ libflate = { git = "https://github.com/asterinas/libflate", rev = "b781da6", features = [
"no_std", "no_std",
] } ] }
core2 = { version = "0.4", default_features = false, features = ["alloc"] } core2 = { version = "0.4", default_features = false, features = ["alloc"] }

2
services/libs/aster-util/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
[dependencies] [dependencies]
aster-frame = { path = "../../../framework/aster-frame" } aster-frame = { path = "../../../framework/aster-frame" }
pod = { git = "https://github.com/jinzhao-dev/pod", rev = "d7dba56" } pod = { git = "https://github.com/asterinas/pod", rev = "d7dba56" }
typeflags-util = { path = "../typeflags-util" } typeflags-util = { path = "../typeflags-util" }
aster-rights-proc = { path = "../aster-rights-proc" } aster-rights-proc = { path = "../aster-rights-proc" }
aster-rights = { path = "../aster-rights" } aster-rights = { path = "../aster-rights" }

2
services/libs/comp-sys/cargo-component/README.md
View File

@ -1,5 +1,5 @@
## Overview ## Overview
The crate contains cargo-component, a cargo subcommand to enable component-level access control in Asterinas. For more info about Asterinas component system, see the [RFC](https://github.com/jinzhao-dev/Asterinas/issues/58). The implementation mainly follows [rust clippy](https://github.com/rust-lang/rust-clippy). Internally, this tool will call `cargo check` to compile the whole project and bases the analysis on MIR. The crate contains cargo-component, a cargo subcommand to enable component-level access control in Asterinas. For more info about Asterinas component system, see the [RFC](https://github.com/asterinas/Asterinas/issues/58). The implementation mainly follows [rust clippy](https://github.com/rust-lang/rust-clippy). Internally, this tool will call `cargo check` to compile the whole project and bases the analysis on MIR.
## install ## install
After running `make setup` for Asterinas, this crate can be created with cargo. After running `make setup` for Asterinas, this crate can be created with cargo.