diff --git a/Cargo.lock b/Cargo.lock index f811274b..591a040c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -796,7 +796,7 @@ dependencies = [ [[package]] name = "inherit-methods-macro" 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 = [ "darling", "proc-macro2", @@ -918,7 +918,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libflate" 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 = [ "adler32", "core2", @@ -929,7 +929,7 @@ dependencies = [ [[package]] name = "libflate_lz77" 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 = [ "core2", "hashbrown 0.13.2", @@ -1059,7 +1059,7 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pod" 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 = [ "pod-derive", ] @@ -1067,7 +1067,7 @@ dependencies = [ [[package]] name = "pod-derive" 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 = [ "proc-macro2", "quote", @@ -1428,7 +1428,7 @@ dependencies = [ [[package]] name = "trapframe" 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 = [ "log", "pod", diff --git a/framework/aster-frame/Cargo.toml b/framework/aster-frame/Cargo.toml index 27e3cd02..827dfcef 100644 --- a/framework/aster-frame/Cargo.toml +++ b/framework/aster-frame/Cargo.toml @@ -13,17 +13,17 @@ bitvec = { version = "1.0", default-features = false, features = ["alloc"] } buddy_system_allocator = "0.9.0" cfg-if = "1.0" 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" } intrusive-collections = "0.9.5" ktest = { path = "../libs/ktest" } lazy_static = { version = "1.0", features = ["spin_no_std"] } 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" static_assertions = "1.1.0" 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"] } volatile = { version = "0.4.5", features = ["unstable"] } diff --git a/regression/Makefile b/regression/Makefile index 87da25cd..dc21bb1a 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -39,7 +39,7 @@ $(INITRAMFS)/lib/x86_64-linux-gnu: @cp -L /lib/x86_64-linux-gnu/libz.so.1 $@ @cp -L /usr/local/benchmark/iperf/lib/libiperf.so.0 $@ @# 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 @cp -L ./linux_vdso/vdso64.so $@ @rm -rf ./linux_vdso diff --git a/regression/syscall_test/Makefile b/regression/syscall_test/Makefile index ca06ca6d..d78412f1 100644 --- a/regression/syscall_test/Makefile +++ b/regression/syscall_test/Makefile @@ -33,7 +33,7 @@ $(BIN_DIR): $(SRC_DIR) $(SRC_DIR): @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 $(TARGET_DIR): $(RUN_BASH) $(BLOCK_LIST) diff --git a/services/comps/network/Cargo.toml b/services/comps/network/Cargo.toml index 97cc67ed..60562e89 100644 --- a/services/comps/network/Cargo.toml +++ b/services/comps/network/Cargo.toml @@ -13,7 +13,7 @@ aster-rights = { path = "../../libs/aster-rights" } align_ext = { path = "../../../framework/libs/align_ext" } int-to-c-enum = { path = "../../libs/int-to-c-enum" } 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" spin = "0.9.4" ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] } diff --git a/services/comps/virtio/Cargo.toml b/services/comps/virtio/Cargo.toml index f014aa13..e5570c99 100644 --- a/services/comps/virtio/Cargo.toml +++ b/services/comps/virtio/Cargo.toml @@ -19,7 +19,7 @@ aster-frame = { path = "../../../framework/aster-frame" } aster-util = { path = "../../libs/aster-util" } aster-rights = { path = "../../libs/aster-rights" } 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" } log = "0.4" bit_field = "0.10.1" diff --git a/services/libs/aster-std/Cargo.toml b/services/libs/aster-std/Cargo.toml index 6465467d..e09364dc 100644 --- a/services/libs/aster-std/Cargo.toml +++ b/services/libs/aster-std/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] aster-frame = { path = "../../../framework/aster-frame" } 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-block = { path = "../../comps/block" } aster-network = { path = "../../comps/network" } @@ -52,7 +52,7 @@ bitflags = "1.3" ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] } keyable-arc = { path = "../keyable-arc" } # 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", ] } core2 = { version = "0.4", default_features = false, features = ["alloc"] } diff --git a/services/libs/aster-util/Cargo.toml b/services/libs/aster-util/Cargo.toml index 02d1401a..d21d6723 100644 --- a/services/libs/aster-util/Cargo.toml +++ b/services/libs/aster-util/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] 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" } aster-rights-proc = { path = "../aster-rights-proc" } aster-rights = { path = "../aster-rights" } diff --git a/services/libs/comp-sys/cargo-component/README.md b/services/libs/comp-sys/cargo-component/README.md index 374423b8..e5871e67 100644 --- a/services/libs/comp-sys/cargo-component/README.md +++ b/services/libs/comp-sys/cargo-component/README.md @@ -1,5 +1,5 @@ ## 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 After running `make setup` for Asterinas, this crate can be created with cargo.