From e4754c9e85eac706cf5414492a9f15bf201b72f9 Mon Sep 17 00:00:00 2001 From: Yuekai Jia Date: Fri, 5 Jul 2024 00:35:14 +0800 Subject: [PATCH 1/3] CI: set `continue-on-error = true` on each steps for nightliy build --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 148fe7138e..935dbdda34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,16 @@ jobs: - name: Check rust version run: rustc --version --verbose - name: Clippy for the default target + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make clippy - name: Clippy for x86_64 + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make clippy ARCH=x86_64 - name: Clippy for riscv64 + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make clippy ARCH=riscv64 - name: Clippy for aarch64 + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make clippy ARCH=aarch64 - name: Check code format run: cargo fmt --all -- --check @@ -51,32 +55,46 @@ jobs: - uses: Swatinem/rust-cache@v2 - run: cargo install cargo-binutils - name: Build helloworld + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/helloworld - name: Build memtest + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/memtest - name: Build exception + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/exception - name: Build display + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/display - name: Build task/yield + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/task/yield - name: Build task/parallel + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/task/parallel - name: Build task/sleep + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/task/sleep - name: Build task/priority + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/task/priority - name: Build task/tls + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/task/tls - name: Build fs/shell + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/fs/shell - name: Build net/echoserver + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/net/echoserver - name: Build net/httpclient + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/net/httpclient - name: Build net/httpserver + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/net/httpserver - name: Build net/udpserver + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make ARCH=${{ matrix.arch }} A=apps/net/udpserver - uses: ./.github/workflows/actions/setup-musl @@ -130,20 +148,27 @@ jobs: arch: x86_64 - name: Build helloworld for x86_64-pc-oslab + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make PLATFORM=x86_64-pc-oslab A=apps/helloworld - name: Build net/httpserver for x86_64-pc-oslab + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make PLATFORM=x86_64-pc-oslab A=apps/net/httpserver FEATURES=driver-ixgbe - name: Build c/iperf for x86_64-pc-oslab + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make PLATFORM=x86_64-pc-oslab A=apps/c/iperf FEATURES=driver-ixgbe,driver-ramdisk - name: Build c/redis for x86_64-pc-oslab + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make PLATFORM=x86_64-pc-oslab A=apps/c/redis FEATURES=driver-ixgbe,driver-ramdisk SMP=4 - name: Build helloworld for aarch64-raspi4 + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make PLATFORM=aarch64-raspi4 A=apps/helloworld - name: Build fs/shell for aarch64-raspi4 + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make PLATFORM=aarch64-raspi4 A=apps/fs/shell FEATURES=driver-bcm2835-sdhci - name: Build helloworld for aarch64-bsta1000b + continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }} run: make PLATFORM=aarch64-bsta1000b A=apps/helloworld build-apps-for-std: From a3256a9380a445ef3e75e500110f604c8edbab5a Mon Sep 17 00:00:00 2001 From: Yuekai Jia Date: Tue, 9 Jul 2024 21:32:41 +0800 Subject: [PATCH 2/3] Rename organization rcore-os to arceos-org --- README.md | 26 +++++++++++++++++++++++--- api/arceos_api/Cargo.toml | 8 ++++---- api/arceos_api/src/lib.rs | 2 +- api/arceos_posix_api/Cargo.toml | 5 +++-- api/arceos_posix_api/src/lib.rs | 2 +- api/axfeat/Cargo.toml | 8 ++++---- api/axfeat/src/lib.rs | 2 +- apps/c/httpserver/httpserver.c | 4 ++-- apps/net/httpserver/src/main.rs | 4 ++-- crates/allocator/Cargo.toml | 8 ++++---- crates/arm_gic/Cargo.toml | 8 ++++---- crates/arm_pl011/Cargo.toml | 8 ++++---- crates/axerrno/Cargo.toml | 8 ++++---- crates/axerrno/src/lib.rs | 2 +- crates/axfs_devfs/Cargo.toml | 8 ++++---- crates/axfs_devfs/src/lib.rs | 2 +- crates/axfs_ramfs/Cargo.toml | 8 ++++---- crates/axfs_ramfs/src/lib.rs | 2 +- crates/axfs_vfs/Cargo.toml | 8 ++++---- crates/axfs_vfs/src/lib.rs | 2 +- crates/axio/Cargo.toml | 8 ++++---- crates/capability/Cargo.toml | 8 ++++---- crates/crate_interface/Cargo.toml | 8 ++++---- crates/driver_block/Cargo.toml | 8 ++++---- crates/driver_common/Cargo.toml | 8 ++++---- crates/driver_common/src/lib.rs | 2 +- crates/driver_display/Cargo.toml | 8 ++++---- crates/driver_net/Cargo.toml | 8 ++++---- crates/driver_pci/Cargo.toml | 8 ++++---- crates/driver_virtio/Cargo.toml | 8 ++++---- crates/dw_apb_uart/Cargo.toml | 6 ++++-- crates/flatten_objects/Cargo.toml | 8 ++++---- crates/handler_table/Cargo.toml | 8 ++++---- crates/kernel_guard/Cargo.toml | 8 ++++---- crates/lazy_init/Cargo.toml | 8 ++++---- crates/linked_list/Cargo.toml | 6 +++--- crates/memory_addr/Cargo.toml | 8 ++++---- crates/page_table/Cargo.toml | 8 ++++---- crates/page_table_entry/Cargo.toml | 8 ++++---- crates/percpu/Cargo.toml | 8 ++++---- crates/percpu_macros/Cargo.toml | 8 ++++---- crates/ratio/Cargo.toml | 8 ++++---- crates/scheduler/Cargo.toml | 8 ++++---- crates/slab_allocator/Cargo.toml | 1 + crates/spinlock/Cargo.toml | 8 ++++---- crates/timer_list/Cargo.toml | 8 ++++---- crates/tuple_for_each/Cargo.toml | 8 ++++---- doc/README.md | 2 +- modules/axalloc/Cargo.toml | 8 ++++---- modules/axalloc/src/lib.rs | 2 +- modules/axconfig/Cargo.toml | 8 ++++---- modules/axconfig/src/lib.rs | 4 ++-- modules/axdisplay/Cargo.toml | 8 ++++---- modules/axdisplay/src/lib.rs | 2 +- modules/axdriver/Cargo.toml | 8 ++++---- modules/axdriver/src/lib.rs | 2 +- modules/axfs/Cargo.toml | 8 ++++---- modules/axfs/src/lib.rs | 2 +- modules/axhal/Cargo.toml | 8 ++++---- modules/axhal/src/lib.rs | 2 +- modules/axlog/Cargo.toml | 8 ++++---- modules/axlog/src/lib.rs | 2 +- modules/axnet/Cargo.toml | 8 ++++---- modules/axnet/src/lib.rs | 2 +- modules/axruntime/Cargo.toml | 8 ++++---- modules/axruntime/src/lib.rs | 2 +- modules/axsync/Cargo.toml | 8 ++++---- modules/axsync/src/lib.rs | 2 +- modules/axtask/Cargo.toml | 8 ++++---- modules/axtask/src/lib.rs | 2 +- ulib/axlibc/Cargo.toml | 8 ++++---- ulib/axlibc/src/lib.rs | 2 +- ulib/axstd/Cargo.toml | 8 ++++---- ulib/axstd/src/lib.rs | 2 +- 74 files changed, 241 insertions(+), 217 deletions(-) diff --git a/README.md b/README.md index 6176059286..f5465d860f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # ArceOS -[![CI](https://github.com/rcore-os/arceos/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/rcore-os/arceos/actions/workflows/build.yml) -[![CI](https://github.com/rcore-os/arceos/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/rcore-os/arceos/actions/workflows/test.yml) -[![Docs](https://img.shields.io/badge/docs-pages-green)](https://rcore-os.github.io/arceos/) +[![CI](https://github.com/arceos-org/arceos/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/arceos-org/arceos/actions/workflows/build.yml) +[![CI](https://github.com/arceos-org/arceos/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/arceos-org/arceos/actions/workflows/test.yml) +[![Docs](https://img.shields.io/badge/docs-pages-green)](https://arceos-org.github.io/arceos/) An experimental modular operating system (or unikernel) written in Rust. @@ -192,6 +192,26 @@ make PLATFORM=aarch64-raspi4 A=apps/fs/shell FEATURES=driver-bcm2835-sdhci make PLATFORM=x86_64-pc-oslab A=apps/c/redis FEATURES=driver-ixgbe,driver-ramdisk SMP=4 ``` +### How to reuse ArceOS crates/modules in your own project + +* For packages have been published to crates.io (listed in [doc/README.md](doc/README.md#crates)): + + ```toml + # In Cargo.toml + [dependencies] + memory_addr = "0.1" # crates/memory_addr + crate_interface = "0.1" # crates/crate_interface + ``` + +* For packages not published to crates.io: + + ```toml + # In Cargo.toml + [dependencies] + scheduler = { git = "https://github.com/arceos-org/arceos.git", tag = "0.1.0" } # crates/scheduler + axhal = { git = "https://github.com/arceos-org/arceos.git", tag = "0.1.0" } # modules/axhal + ``` + ## Design ![](doc/figures/ArceOS.svg) diff --git a/api/arceos_api/Cargo.toml b/api/arceos_api/Cargo.toml index 3699a6c468..79bbab84cb 100644 --- a/api/arceos_api/Cargo.toml +++ b/api/arceos_api/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Public APIs and types for ArceOS modules" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/api/arceos_api" -documentation = "https://rcore-os.github.io/arceos/arceos_api/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/api/arceos_api" +documentation = "https://arceos-org.github.io/arceos/arceos_api/index.html" [features] default = [] diff --git a/api/arceos_api/src/lib.rs b/api/arceos_api/src/lib.rs index eacf0f5f2d..5b8404943b 100644 --- a/api/arceos_api/src/lib.rs +++ b/api/arceos_api/src/lib.rs @@ -1,6 +1,6 @@ //! Public APIs and types for [ArceOS] modules //! -//! [ArceOS]: https://github.com/rcore-os/arceos +//! [ArceOS]: https://github.com/arceos-org/arceos #![no_std] #![feature(doc_auto_cfg)] diff --git a/api/arceos_posix_api/Cargo.toml b/api/arceos_posix_api/Cargo.toml index 9a71fd4f34..ef24e854eb 100644 --- a/api/arceos_posix_api/Cargo.toml +++ b/api/arceos_posix_api/Cargo.toml @@ -11,8 +11,9 @@ authors = [ "Shiping Yuan ", ] description = "POSIX-compatible APIs for ArceOS modules" -license = "GPL-3.0-or-later OR Apache-2.0" -repository = "https://github.com/rcore-os/arceos/tree/main/api/arceos_posix_api" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/api/arceos_posix_api" [features] default = [] diff --git a/api/arceos_posix_api/src/lib.rs b/api/arceos_posix_api/src/lib.rs index 668d144aaa..50ccb833f4 100644 --- a/api/arceos_posix_api/src/lib.rs +++ b/api/arceos_posix_api/src/lib.rs @@ -1,6 +1,6 @@ //! POSIX-compatible APIs for [ArceOS] modules //! -//! [ArceOS]: https://github.com/rcore-os/arceos +//! [ArceOS]: https://github.com/arceos-org/arceos #![cfg_attr(all(not(test), not(doc)), no_std)] #![feature(doc_cfg)] diff --git a/api/axfeat/Cargo.toml b/api/axfeat/Cargo.toml index 2947a7ea1d..27ab188f3b 100644 --- a/api/axfeat/Cargo.toml +++ b/api/axfeat/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Top-level feature selection for ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/api/axfeat" -documentation = "https://rcore-os.github.io/arceos/axfeat/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/api/axfeat" +documentation = "https://arceos-org.github.io/arceos/axfeat/index.html" [features] default = [] diff --git a/api/axfeat/src/lib.rs b/api/axfeat/src/lib.rs index 619285272c..85fc2abb26 100644 --- a/api/axfeat/src/lib.rs +++ b/api/axfeat/src/lib.rs @@ -35,6 +35,6 @@ //! - `log-level-error`, `log-level-warn`, `log-level-info`, `log-level-debug`, //! `log-level-trace`: Keep logging only at the specified level or higher. //! -//! [ArceOS]: https://github.com/rcore-os/arceos +//! [ArceOS]: https://github.com/arceos-org/arceos #![no_std] diff --git a/apps/c/httpserver/httpserver.c b/apps/c/httpserver/httpserver.c index 4480785aae..b6f7ac5f50 100644 --- a/apps/c/httpserver/httpserver.c +++ b/apps/c/httpserver/httpserver.c @@ -20,11 +20,11 @@ const char content[] = "\n\ \n\ \n\
\n\ -

Hello, ArceOS

\n\ +

Hello, ArceOS

\n\
\n\
\n\
\n\ - Powered by ArceOS example HTTP server v0.1.0\n\ + Powered by ArceOS example HTTP server v0.1.0\n\
\n\ \n\ \n\ diff --git a/apps/net/httpserver/src/main.rs b/apps/net/httpserver/src/main.rs index a5943a909b..6b18d127b4 100644 --- a/apps/net/httpserver/src/main.rs +++ b/apps/net/httpserver/src/main.rs @@ -38,11 +38,11 @@ const CONTENT: &str = r#"
-

Hello, ArceOS

+

Hello, ArceOS


- Powered by ArceOS example HTTP server v0.1.0 + Powered by ArceOS example HTTP server v0.1.0
diff --git a/crates/allocator/Cargo.toml b/crates/allocator/Cargo.toml index b8770f124d..bc341c792f 100644 --- a/crates/allocator/Cargo.toml +++ b/crates/allocator/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Various allocator algorithms in a unified interface" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/allocator" -documentation = "https://rcore-os.github.io/arceos/allocator/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/allocator" +documentation = "https://arceos-org.github.io/arceos/allocator/index.html" [features] default = [] diff --git a/crates/arm_gic/Cargo.toml b/crates/arm_gic/Cargo.toml index ce2f065305..00027f3835 100644 --- a/crates/arm_gic/Cargo.toml +++ b/crates/arm_gic/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "ARM Generic Interrupt Controller (GIC) register definitions and basic operations" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/arm_gic" -documentation = "https://rcore-os.github.io/arceos/arm_gic/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/arm_gic" +documentation = "https://arceos-org.github.io/arceos/arm_gic/index.html" [dependencies] tock-registers = "0.8" diff --git a/crates/arm_pl011/Cargo.toml b/crates/arm_pl011/Cargo.toml index cf01a67eaa..7973fc844d 100644 --- a/crates/arm_pl011/Cargo.toml +++ b/crates/arm_pl011/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "ARM Uart pl011 register definitions and basic operations" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/arm_pl011" -documentation = "https://rcore-os.github.io/arceos/arm_pl011/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/arm_pl011" +documentation = "https://arceos-org.github.io/arceos/arm_pl011/index.html" [dependencies] tock-registers = "0.8" diff --git a/crates/axerrno/Cargo.toml b/crates/axerrno/Cargo.toml index e686496e84..552c98c5eb 100644 --- a/crates/axerrno/Cargo.toml +++ b/crates/axerrno/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Error code definition used by ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/axerrno" -documentation = "https://rcore-os.github.io/arceos/axerrno/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/axerrno" +documentation = "https://arceos-org.github.io/arceos/axerrno/index.html" [dependencies] log = "0.4" diff --git a/crates/axerrno/src/lib.rs b/crates/axerrno/src/lib.rs index 81bb6d82fd..ad25e1458a 100644 --- a/crates/axerrno/src/lib.rs +++ b/crates/axerrno/src/lib.rs @@ -1,4 +1,4 @@ -//! Error code definition used by [ArceOS](https://github.com/rcore-os/arceos). +//! Error code definition used by [ArceOS](https://github.com/arceos-org/arceos). //! //! It provides two error types and the corresponding result types: //! diff --git a/crates/axfs_devfs/Cargo.toml b/crates/axfs_devfs/Cargo.toml index c618c80bb8..c244c968e4 100644 --- a/crates/axfs_devfs/Cargo.toml +++ b/crates/axfs_devfs/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Device filesystem used by ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/axfs_devfs" -documentation = "https://rcore-os.github.io/arceos/axfs_devfs/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/axfs_devfs" +documentation = "https://arceos-org.github.io/arceos/axfs_devfs/index.html" [dependencies] axfs_vfs = { path = "../axfs_vfs" } diff --git a/crates/axfs_devfs/src/lib.rs b/crates/axfs_devfs/src/lib.rs index 3e61023749..1e916290c4 100644 --- a/crates/axfs_devfs/src/lib.rs +++ b/crates/axfs_devfs/src/lib.rs @@ -1,4 +1,4 @@ -//! Device filesystem used by [ArceOS](https://github.com/rcore-os/arceos). +//! Device filesystem used by [ArceOS](https://github.com/arceos-org/arceos). //! //! The implementation is based on [`axfs_vfs`]. diff --git a/crates/axfs_ramfs/Cargo.toml b/crates/axfs_ramfs/Cargo.toml index 928cc2a782..d725f4464f 100644 --- a/crates/axfs_ramfs/Cargo.toml +++ b/crates/axfs_ramfs/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "RAM filesystem used by ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/axfs_ramfs" -documentation = "https://rcore-os.github.io/arceos/axfs_ramfs/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/axfs_ramfs" +documentation = "https://arceos-org.github.io/arceos/axfs_ramfs/index.html" [dependencies] axfs_vfs = { path = "../axfs_vfs" } diff --git a/crates/axfs_ramfs/src/lib.rs b/crates/axfs_ramfs/src/lib.rs index 4d57ecaf5d..44bc1f3e98 100644 --- a/crates/axfs_ramfs/src/lib.rs +++ b/crates/axfs_ramfs/src/lib.rs @@ -1,4 +1,4 @@ -//! RAM filesystem used by [ArceOS](https://github.com/rcore-os/arceos). +//! RAM filesystem used by [ArceOS](https://github.com/arceos-org/arceos). //! //! The implementation is based on [`axfs_vfs`]. diff --git a/crates/axfs_vfs/Cargo.toml b/crates/axfs_vfs/Cargo.toml index 9e2a74e601..a8965925af 100644 --- a/crates/axfs_vfs/Cargo.toml +++ b/crates/axfs_vfs/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Virtual filesystem interfaces used by ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/axfs_vfs" -documentation = "https://rcore-os.github.io/arceos/axfs_vfs/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/axfs_vfs" +documentation = "https://arceos-org.github.io/arceos/axfs_vfs/index.html" [features] default = [] diff --git a/crates/axfs_vfs/src/lib.rs b/crates/axfs_vfs/src/lib.rs index ee807a812e..73de7e823f 100644 --- a/crates/axfs_vfs/src/lib.rs +++ b/crates/axfs_vfs/src/lib.rs @@ -1,4 +1,4 @@ -//! Virtual filesystem interfaces used by [ArceOS](https://github.com/rcore-os/arceos). +//! Virtual filesystem interfaces used by [ArceOS](https://github.com/arceos-org/arceos). //! //! A filesystem is a set of files and directories (symbol links are not //! supported currently), collectively referred to as **nodes**, which are diff --git a/crates/axio/Cargo.toml b/crates/axio/Cargo.toml index 02ea0d1d55..e63f30bf50 100644 --- a/crates/axio/Cargo.toml +++ b/crates/axio/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "`std::io`-like I/O traits for `no_std` environment" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/axio" -documentation = "https://rcore-os.github.io/arceos/axio/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/axio" +documentation = "https://arceos-org.github.io/arceos/axio/index.html" [features] alloc = [] diff --git a/crates/capability/Cargo.toml b/crates/capability/Cargo.toml index 0ac005f965..76f966ea1a 100644 --- a/crates/capability/Cargo.toml +++ b/crates/capability/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Provide basic capability-based security" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/capability" -documentation = "https://rcore-os.github.io/arceos/capability/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/capability" +documentation = "https://arceos-org.github.io/arceos/capability/index.html" [dependencies] bitflags = "2.5" diff --git a/crates/crate_interface/Cargo.toml b/crates/crate_interface/Cargo.toml index 7608daea3a..988a556131 100644 --- a/crates/crate_interface/Cargo.toml +++ b/crates/crate_interface/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.1" edition = "2021" authors = ["Yuekai Jia "] description = "Provides a way to define an interface (trait) in a crate, but can implement or use it in any crate." -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/crate_interface" -documentation = "https://rcore-os.github.io/arceos/crate_interface/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/crate_interface" +documentation = "https://docs.rs/crate_interface" keywords = ["arceos", "api", "macro"] categories = ["development-tools::procedural-macro-helpers", "no-std"] diff --git a/crates/driver_block/Cargo.toml b/crates/driver_block/Cargo.toml index c81c000015..1a686566c3 100644 --- a/crates/driver_block/Cargo.toml +++ b/crates/driver_block/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Common traits and types for block storage drivers" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_common" -documentation = "https://rcore-os.github.io/arceos/driver_common/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_common" +documentation = "https://arceos-org.github.io/arceos/driver_common/index.html" [features] ramdisk = [] diff --git a/crates/driver_common/Cargo.toml b/crates/driver_common/Cargo.toml index b3bfe7add3..a53e069721 100644 --- a/crates/driver_common/Cargo.toml +++ b/crates/driver_common/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Device driver interfaces used by ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_common" -documentation = "https://rcore-os.github.io/arceos/driver_common/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_common" +documentation = "https://arceos-org.github.io/arceos/driver_common/index.html" [dependencies] diff --git a/crates/driver_common/src/lib.rs b/crates/driver_common/src/lib.rs index c249b98837..ffaa1f7d4d 100644 --- a/crates/driver_common/src/lib.rs +++ b/crates/driver_common/src/lib.rs @@ -8,7 +8,7 @@ //! - [`driver_display`][3]: Common traits and types for graphics display drivers. //! - [`driver_net`][4]: Common traits and types for network (NIC) drivers. //! -//! [1]: https://github.com/rcore-os/arceos +//! [1]: https://github.com/arceos-org/arceos //! [2]: ../driver_block/index.html //! [3]: ../driver_display/index.html //! [4]: ../driver_net/index.html diff --git a/crates/driver_display/Cargo.toml b/crates/driver_display/Cargo.toml index e199c626b3..b0a84a7951 100644 --- a/crates/driver_display/Cargo.toml +++ b/crates/driver_display/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Shiping Yuan "] description = "Common traits and types for graphics device drivers" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_display" -documentation = "https://rcore-os.github.io/arceos/driver_display/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_display" +documentation = "https://arceos-org.github.io/arceos/driver_display/index.html" [dependencies] driver_common = { path = "../driver_common" } diff --git a/crates/driver_net/Cargo.toml b/crates/driver_net/Cargo.toml index 5018c4a7c8..b448d4127e 100644 --- a/crates/driver_net/Cargo.toml +++ b/crates/driver_net/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia ", "ChengXiang Qi "] description = "Common traits and types for network device (NIC) drivers" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_net" -documentation = "https://rcore-os.github.io/arceos/driver_net/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_net" +documentation = "https://arceos-org.github.io/arceos/driver_net/index.html" [features] default = [] diff --git a/crates/driver_pci/Cargo.toml b/crates/driver_pci/Cargo.toml index f18c603379..bce8766e70 100644 --- a/crates/driver_pci/Cargo.toml +++ b/crates/driver_pci/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Structures and functions for PCI bus operations" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_pci" -documentation = "https://rcore-os.github.io/arceos/driver_pci/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_pci" +documentation = "https://arceos-org.github.io/arceos/driver_pci/index.html" [dependencies] virtio-drivers = "0.7.3" diff --git a/crates/driver_virtio/Cargo.toml b/crates/driver_virtio/Cargo.toml index dea8babd78..eb9a97b791 100644 --- a/crates/driver_virtio/Cargo.toml +++ b/crates/driver_virtio/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia ", "ChengXiang Qi "] description = "Wrappers of some devices in the `virtio-drivers` crate, that implement traits in the `driver_common` series crates" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/driver_virtio" -documentation = "https://rcore-os.github.io/arceos/driver_virtio/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_virtio" +documentation = "https://arceos-org.github.io/arceos/driver_virtio/index.html" [features] block = ["driver_block"] diff --git a/crates/dw_apb_uart/Cargo.toml b/crates/dw_apb_uart/Cargo.toml index 503e44baa5..a5db2b9ce2 100644 --- a/crates/dw_apb_uart/Cargo.toml +++ b/crates/dw_apb_uart/Cargo.toml @@ -3,9 +3,11 @@ name = "dw_apb_uart" authors = ["Luoyuan Xiao "] version = "0.1.0" edition = "2021" -license = "GPL-2.0" -repository = "https://github.com/elliott10/arceos/tree/main/crates/dw_apb_uart" description = "Uart snps,dw-apb-uart driver in Rust for BST A1000b FADA board." +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/dw_apb_uart" +documentation = "https://arceos-org.github.io/arceos/dw_apb_uart/index.html" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/flatten_objects/Cargo.toml b/crates/flatten_objects/Cargo.toml index aea72b5a7a..2330c79588 100644 --- a/crates/flatten_objects/Cargo.toml +++ b/crates/flatten_objects/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "A container that stores numbered objects. Each object can be assigned with a unique ID." -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/flatten_objects" -documentation = "https://rcore-os.github.io/arceos/flatten_objects/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/flatten_objects" +documentation = "https://arceos-org.github.io/arceos/flatten_objects/index.html" [dependencies] bitmaps = { version = "3.2", default-features = false } diff --git a/crates/handler_table/Cargo.toml b/crates/handler_table/Cargo.toml index e4ecacea95..e219e30cad 100644 --- a/crates/handler_table/Cargo.toml +++ b/crates/handler_table/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "A lock-free table of event handlers" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/handler_table" -documentation = "https://rcore-os.github.io/arceos/handler_table/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/handler_table" +documentation = "https://docs.rs/handler_table" keywords = ["arceos", "event", "lock-free"] categories = ["no-std"] diff --git a/crates/kernel_guard/Cargo.toml b/crates/kernel_guard/Cargo.toml index 8414701995..1c7f92429f 100644 --- a/crates/kernel_guard/Cargo.toml +++ b/crates/kernel_guard/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "RAII wrappers to create a critical section with local IRQs or preemption disabled" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/kernel_guard" -documentation = "https://rcore-os.github.io/arceos/kernel_guard/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/kernel_guard" +documentation = "https://docs.rs/kernel_guard" keywords = ["arceos", "synchronization", "preemption"] categories = ["os", "no-std"] diff --git a/crates/lazy_init/Cargo.toml b/crates/lazy_init/Cargo.toml index 78d6a09bdb..8c4c0d19ad 100644 --- a/crates/lazy_init/Cargo.toml +++ b/crates/lazy_init/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "A wrapper for lazy initialized values without concurrency safety but more efficient" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/lazy_init" -documentation = "https://rcore-os.github.io/arceos/lazy_init/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/lazy_init" +documentation = "https://arceos-org.github.io/arceos/lazy_init/index.html" [dependencies] diff --git a/crates/linked_list/Cargo.toml b/crates/linked_list/Cargo.toml index 73fe1a04cb..6652f4e002 100644 --- a/crates/linked_list/Cargo.toml +++ b/crates/linked_list/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" authors = ["Wedson Almeida Filho "] description = "Linked lists that supports arbitrary removal in constant time" license = "GPL-2.0-or-later" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/linked_list" -documentation = "https://rcore-os.github.io/arceos/linked_list/index.html" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/linked_list" +documentation = "https://arceos-org.github.io/arceos/linked_list/index.html" [dependencies] diff --git a/crates/memory_addr/Cargo.toml b/crates/memory_addr/Cargo.toml index 1b900359d0..282f36f14c 100644 --- a/crates/memory_addr/Cargo.toml +++ b/crates/memory_addr/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Wrappers and helper functions for physical and virtual addresses" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/memory_addr" -documentation = "https://rcore-os.github.io/arceos/memory_addr/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/memory_addr" +documentation = "https://docs.rs/memory_addr" keywords = ["arceos", "address", "virtual-memory"] categories = ["os", "memory-management", "no-std"] diff --git a/crates/page_table/Cargo.toml b/crates/page_table/Cargo.toml index 4178458b11..370c593e4c 100644 --- a/crates/page_table/Cargo.toml +++ b/crates/page_table/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Generic page table structures for various hardware architectures" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/page_table" -documentation = "https://rcore-os.github.io/arceos/page_table/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/page_table" +documentation = "https://arceos-org.github.io/arceos/page_table/index.html" [dependencies] log = "0.4" diff --git a/crates/page_table_entry/Cargo.toml b/crates/page_table_entry/Cargo.toml index 6222afa9c6..bb723b11eb 100644 --- a/crates/page_table_entry/Cargo.toml +++ b/crates/page_table_entry/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Page table entry definition for various hardware architectures" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/page_table_entry" -documentation = "https://rcore-os.github.io/arceos/page_table_entry/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/page_table_entry" +documentation = "https://arceos-org.github.io/arceos/page_table_entry/index.html" [dependencies] bitflags = "2.5" diff --git a/crates/percpu/Cargo.toml b/crates/percpu/Cargo.toml index 8641691225..96621ea5ba 100644 --- a/crates/percpu/Cargo.toml +++ b/crates/percpu/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Define and access per-CPU data structures" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/percpu" -documentation = "https://rcore-os.github.io/arceos/percpu/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/percpu" +documentation = "https://arceos-org.github.io/arceos/percpu/index.html" [features] # For single CPU use, just make the per-CPU data a global variable. diff --git a/crates/percpu_macros/Cargo.toml b/crates/percpu_macros/Cargo.toml index 1f6963fbfa..d16c1931d4 100644 --- a/crates/percpu_macros/Cargo.toml +++ b/crates/percpu_macros/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Macros to define and access a per-CPU data structure" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/percpu_macros" -documentation = "https://rcore-os.github.io/arceos/percpu_macros/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/percpu_macros" +documentation = "https://arceos-org.github.io/arceos/percpu_macros/index.html" [features] # For single CPU use, just make the per-CPU data a global variable. diff --git a/crates/ratio/Cargo.toml b/crates/ratio/Cargo.toml index 2dae14d41d..a914840ad6 100644 --- a/crates/ratio/Cargo.toml +++ b/crates/ratio/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "The type of ratios and related operations" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/ratio" -documentation = "https://rcore-os.github.io/arceos/ratio/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/ratio" +documentation = "https://arceos-org.github.io/arceos/ratio/index.html" [dependencies] diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml index e6a26af2cf..83579ac51f 100644 --- a/crates/scheduler/Cargo.toml +++ b/crates/scheduler/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Various scheduler algorithms in a unified interface" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/scheduler" -documentation = "https://rcore-os.github.io/arceos/scheduler/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/scheduler" +documentation = "https://arceos-org.github.io/arceos/scheduler/index.html" [dependencies] linked_list = { path = "../linked_list" } diff --git a/crates/slab_allocator/Cargo.toml b/crates/slab_allocator/Cargo.toml index faba1f5e5f..039c230c89 100644 --- a/crates/slab_allocator/Cargo.toml +++ b/crates/slab_allocator/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "slab_allocator" version = "0.3.1" +edition = "2021" authors = ["Robert Węcławski ", "Yiren Zhang "] license = "MIT" diff --git a/crates/spinlock/Cargo.toml b/crates/spinlock/Cargo.toml index 1dd75e3d21..fe33989471 100644 --- a/crates/spinlock/Cargo.toml +++ b/crates/spinlock/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "`no_std` spin lock implementation that can disable kernel local IRQs or preemption while locking" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/spinlock" -documentation = "https://rcore-os.github.io/arceos/spinlock/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/spinlock" +documentation = "https://arceos-org.github.io/arceos/spinlock/index.html" [features] # To use in the multi-core environment diff --git a/crates/timer_list/Cargo.toml b/crates/timer_list/Cargo.toml index edaef6878d..2b8e95a4ec 100644 --- a/crates/timer_list/Cargo.toml +++ b/crates/timer_list/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "A list of timed events that will be triggered sequentially when the timer expires" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/timer_list" -documentation = "https://rcore-os.github.io/arceos/timer_list/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/timer_list" +documentation = "https://arceos-org.github.io/arceos/timer_list/index.html" [dependencies] diff --git a/crates/tuple_for_each/Cargo.toml b/crates/tuple_for_each/Cargo.toml index 0412dcedf4..e9466a2cbb 100644 --- a/crates/tuple_for_each/Cargo.toml +++ b/crates/tuple_for_each/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Provides macros and methods to iterate over the fields of a tuple struct" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/crates/tuple_for_each" -documentation = "https://rcore-os.github.io/arceos/tuple_for_each/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/crates/tuple_for_each" +documentation = "https://arceos-org.github.io/arceos/tuple_for_each/index.html" [dependencies] proc-macro2 = "1.0" diff --git a/doc/README.md b/doc/README.md index 40603ab39b..b52aea9aff 100644 --- a/doc/README.md +++ b/doc/README.md @@ -2,7 +2,7 @@ ## Rustdoc -* https://rcore-os.github.io/arceos/ +* https://arceos-org.github.io/arceos/ ## ArceOS Modules diff --git a/modules/axalloc/Cargo.toml b/modules/axalloc/Cargo.toml index 40eedf404f..bc23332df9 100644 --- a/modules/axalloc/Cargo.toml +++ b/modules/axalloc/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "ArceOS global memory allocator" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axalloc" -documentation = "https://rcore-os.github.io/arceos/axalloc/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axalloc" +documentation = "https://arceos-org.github.io/arceos/axalloc/index.html" [features] default = ["tlsf"] diff --git a/modules/axalloc/src/lib.rs b/modules/axalloc/src/lib.rs index 096ce95ae7..e0d8d386d0 100644 --- a/modules/axalloc/src/lib.rs +++ b/modules/axalloc/src/lib.rs @@ -1,4 +1,4 @@ -//! [ArceOS](https://github.com/rcore-os/arceos) global memory allocator. +//! [ArceOS](https://github.com/arceos-org/arceos) global memory allocator. //! //! It provides [`GlobalAllocator`], which implements the trait //! [`core::alloc::GlobalAlloc`]. A static global variable of type diff --git a/modules/axconfig/Cargo.toml b/modules/axconfig/Cargo.toml index 9471f0ad47..3fd89ccc70 100644 --- a/modules/axconfig/Cargo.toml +++ b/modules/axconfig/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Platform-specific constants and parameters for ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axconfig" -documentation = "https://rcore-os.github.io/arceos/axconfig/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axconfig" +documentation = "https://arceos-org.github.io/arceos/axconfig/index.html" [build-dependencies] toml_edit = "0.22" diff --git a/modules/axconfig/src/lib.rs b/modules/axconfig/src/lib.rs index 8705b803fe..6488790b0b 100644 --- a/modules/axconfig/src/lib.rs +++ b/modules/axconfig/src/lib.rs @@ -3,8 +3,8 @@ //! Currently supported platforms can be found in the [platforms] directory of //! the [ArceOS] root. //! -//! [ArceOS]: https://github.com/rcore-os/arceos -//! [platforms]: https://github.com/rcore-os/arceos/tree/main/platforms +//! [ArceOS]: https://github.com/arceos-org/arceos +//! [platforms]: https://github.com/arceos-org/arceos/tree/main/platforms #![no_std] diff --git a/modules/axdisplay/Cargo.toml b/modules/axdisplay/Cargo.toml index 0ce0bf341f..160e7b61d2 100644 --- a/modules/axdisplay/Cargo.toml +++ b/modules/axdisplay/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Shiping Yuan "] description = "ArceOS graphics module" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axdisplay" -documentation = "https://rcore-os.github.io/arceos/axdisplay/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axdisplay" +documentation = "https://arceos-org.github.io/arceos/axdisplay/index.html" [dependencies] log = "0.4" diff --git a/modules/axdisplay/src/lib.rs b/modules/axdisplay/src/lib.rs index 26dc42240a..4c4717392e 100644 --- a/modules/axdisplay/src/lib.rs +++ b/modules/axdisplay/src/lib.rs @@ -1,4 +1,4 @@ -//! [ArceOS](https://github.com/rcore-os/arceos) graphics module. +//! [ArceOS](https://github.com/arceos-org/arceos) graphics module. //! //! Currently only supports direct writing to the framebuffer. diff --git a/modules/axdriver/Cargo.toml b/modules/axdriver/Cargo.toml index 87280a27ee..0dac991b1c 100644 --- a/modules/axdriver/Cargo.toml +++ b/modules/axdriver/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia ", "ChengXiang Qi "] description = "ArceOS device drivers" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axdriver" -documentation = "https://rcore-os.github.io/arceos/axdriver/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axdriver" +documentation = "https://arceos-org.github.io/arceos/axdriver/index.html" [features] dyn = [] diff --git a/modules/axdriver/src/lib.rs b/modules/axdriver/src/lib.rs index cc122bb209..8f9854135c 100644 --- a/modules/axdriver/src/lib.rs +++ b/modules/axdriver/src/lib.rs @@ -1,4 +1,4 @@ -//! [ArceOS](https://github.com/rcore-os/arceos) device drivers. +//! [ArceOS](https://github.com/arceos-org/arceos) device drivers. //! //! # Usage //! diff --git a/modules/axfs/Cargo.toml b/modules/axfs/Cargo.toml index a58bce8eed..ff7f45ce88 100644 --- a/modules/axfs/Cargo.toml +++ b/modules/axfs/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "ArceOS filesystem module" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axfs" -documentation = "https://rcore-os.github.io/arceos/axfs/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axfs" +documentation = "https://arceos-org.github.io/arceos/axfs/index.html" [features] devfs = ["dep:axfs_devfs"] diff --git a/modules/axfs/src/lib.rs b/modules/axfs/src/lib.rs index 07baa2a7d8..3fd60b399b 100644 --- a/modules/axfs/src/lib.rs +++ b/modules/axfs/src/lib.rs @@ -1,4 +1,4 @@ -//! [ArceOS](https://github.com/rcore-os/arceos) filesystem module. +//! [ArceOS](https://github.com/arceos-org/arceos) filesystem module. //! //! It provides unified filesystem operations for various filesystems. //! diff --git a/modules/axhal/Cargo.toml b/modules/axhal/Cargo.toml index f576700784..8ef71d5bb8 100644 --- a/modules/axhal/Cargo.toml +++ b/modules/axhal/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "ArceOS hardware abstraction layer, provides unified APIs for platform-specific operations" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axhal" -documentation = "https://rcore-os.github.io/arceos/axhal/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axhal" +documentation = "https://arceos-org.github.io/arceos/axhal/index.html" [features] smp = [] diff --git a/modules/axhal/src/lib.rs b/modules/axhal/src/lib.rs index 9638553c23..076a65c253 100644 --- a/modules/axhal/src/lib.rs +++ b/modules/axhal/src/lib.rs @@ -21,7 +21,7 @@ //! - `paging`: Enable page table manipulation. //! - `irq`: Enable interrupt handling support. //! -//! [ArceOS]: https://github.com/rcore-os/arceos +//! [ArceOS]: https://github.com/arceos-org/arceos //! [cargo test]: https://doc.rust-lang.org/cargo/guide/tests.html #![no_std] diff --git a/modules/axlog/Cargo.toml b/modules/axlog/Cargo.toml index a679060a47..a5b099cbe8 100644 --- a/modules/axlog/Cargo.toml +++ b/modules/axlog/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Macros for multi-level formatted logging used by ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axlog" -documentation = "https://rcore-os.github.io/arceos/axlog/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axlog" +documentation = "https://arceos-org.github.io/arceos/axlog/index.html" [features] std = ["dep:chrono"] diff --git a/modules/axlog/src/lib.rs b/modules/axlog/src/lib.rs index d3ad70b468..7e63490324 100644 --- a/modules/axlog/src/lib.rs +++ b/modules/axlog/src/lib.rs @@ -1,5 +1,5 @@ //! Macros for multi-level formatted logging used by -//! [ArceOS](https://github.com/rcore-os/arceos). +//! [ArceOS](https://github.com/arceos-org/arceos). //! //! The log macros, in descending order of level, are: [`error!`], [`warn!`], //! [`info!`], [`debug!`], and [`trace!`]. diff --git a/modules/axnet/Cargo.toml b/modules/axnet/Cargo.toml index 32919787a2..710e7aad40 100644 --- a/modules/axnet/Cargo.toml +++ b/modules/axnet/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia ", "ChengXiang Qi "] description = "ArceOS network module" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axnet" -documentation = "https://rcore-os.github.io/arceos/axnet/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axnet" +documentation = "https://arceos-org.github.io/arceos/axnet/index.html" [features] smoltcp = [] diff --git a/modules/axnet/src/lib.rs b/modules/axnet/src/lib.rs index f716a027fc..c446dbf7e0 100644 --- a/modules/axnet/src/lib.rs +++ b/modules/axnet/src/lib.rs @@ -1,4 +1,4 @@ -//! [ArceOS](https://github.com/rcore-os/arceos) network module. +//! [ArceOS](https://github.com/arceos-org/arceos) network module. //! //! It provides unified networking primitives for TCP/UDP communication //! using various underlying network stacks. Currently, only [smoltcp] is diff --git a/modules/axruntime/Cargo.toml b/modules/axruntime/Cargo.toml index ccd000b1d4..1c86fcf2ef 100644 --- a/modules/axruntime/Cargo.toml +++ b/modules/axruntime/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "Runtime library of ArceOS" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axruntime" -documentation = "https://rcore-os.github.io/arceos/axruntime/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axruntime" +documentation = "https://arceos-org.github.io/arceos/axruntime/index.html" [features] default = [] diff --git a/modules/axruntime/src/lib.rs b/modules/axruntime/src/lib.rs index a62c3055cb..b8deef2484 100644 --- a/modules/axruntime/src/lib.rs +++ b/modules/axruntime/src/lib.rs @@ -1,4 +1,4 @@ -//! Runtime library of [ArceOS](https://github.com/rcore-os/arceos). +//! Runtime library of [ArceOS](https://github.com/arceos-org/arceos). //! //! Any application uses ArceOS should link this library. It does some //! initialization work before entering the application's `main` function. diff --git a/modules/axsync/Cargo.toml b/modules/axsync/Cargo.toml index 50a4203c30..148b718627 100644 --- a/modules/axsync/Cargo.toml +++ b/modules/axsync/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "ArceOS synchronization primitives" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axsync" -documentation = "https://rcore-os.github.io/arceos/axsync/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axsync" +documentation = "https://arceos-org.github.io/arceos/axsync/index.html" [features] multitask = ["axtask/multitask"] diff --git a/modules/axsync/src/lib.rs b/modules/axsync/src/lib.rs index 124585017b..2b49cf7319 100644 --- a/modules/axsync/src/lib.rs +++ b/modules/axsync/src/lib.rs @@ -1,4 +1,4 @@ -//! [ArceOS](https://github.com/rcore-os/arceos) synchronization primitives. +//! [ArceOS](https://github.com/arceos-org/arceos) synchronization primitives. //! //! Currently supported primitives: //! diff --git a/modules/axtask/Cargo.toml b/modules/axtask/Cargo.toml index e1eb52709d..8ea3e431d3 100644 --- a/modules/axtask/Cargo.toml +++ b/modules/axtask/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" authors = ["Yuekai Jia "] description = "ArceOS task management module" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/modules/axtask" -documentation = "https://rcore-os.github.io/arceos/axtask/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/modules/axtask" +documentation = "https://arceos-org.github.io/arceos/axtask/index.html" [features] default = [] diff --git a/modules/axtask/src/lib.rs b/modules/axtask/src/lib.rs index b02a1ea1f2..c82b842a9a 100644 --- a/modules/axtask/src/lib.rs +++ b/modules/axtask/src/lib.rs @@ -1,4 +1,4 @@ -//! [ArceOS](https://github.com/rcore-os/arceos) task management module. +//! [ArceOS](https://github.com/arceos-org/arceos) task management module. //! //! This module provides primitives for task management, including task //! creation, scheduling, sleeping, termination, etc. The scheduler algorithm diff --git a/ulib/axlibc/Cargo.toml b/ulib/axlibc/Cargo.toml index 2ac84087bd..9aed32ffa0 100644 --- a/ulib/axlibc/Cargo.toml +++ b/ulib/axlibc/Cargo.toml @@ -11,10 +11,10 @@ authors = [ "Shiping Yuan ", ] description = "ArceOS user program library for C apps" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/ulib/axlibc" -documentation = "https://rcore-os.github.io/arceos/axlibc/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/ulib/axlibc" +documentation = "https://arceos-org.github.io/arceos/axlibc/index.html" [lib] crate-type = ["staticlib"] diff --git a/ulib/axlibc/src/lib.rs b/ulib/axlibc/src/lib.rs index 7bb8cc80cf..f1af45f9e2 100644 --- a/ulib/axlibc/src/lib.rs +++ b/ulib/axlibc/src/lib.rs @@ -21,7 +21,7 @@ //! - `select`: Enable synchronous I/O multiplexing ([select]) support. //! - `epoll`: Enable event polling ([epoll]) support. //! -//! [ArceOS]: https://github.com/rcore-os/arceos +//! [ArceOS]: https://github.com/arceos-org/arceos //! [select]: https://man7.org/linux/man-pages/man2/select.2.html //! [epoll]: https://man7.org/linux/man-pages/man7/epoll.7.html diff --git a/ulib/axstd/Cargo.toml b/ulib/axstd/Cargo.toml index 83239c3ed6..139b616745 100644 --- a/ulib/axstd/Cargo.toml +++ b/ulib/axstd/Cargo.toml @@ -11,10 +11,10 @@ authors = [ "Shiping Yuan ", ] description = "ArceOS user library with an interface similar to rust std" -license = "GPL-3.0-or-later OR Apache-2.0" -homepage = "https://github.com/rcore-os/arceos" -repository = "https://github.com/rcore-os/arceos/tree/main/ulib/axstd" -documentation = "https://rcore-os.github.io/arceos/axstd/index.html" +license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" +homepage = "https://github.com/arceos-org/arceos" +repository = "https://github.com/arceos-org/arceos/tree/main/ulib/axstd" +documentation = "https://arceos-org.github.io/arceos/axstd/index.html" [features] default = [] diff --git a/ulib/axstd/src/lib.rs b/ulib/axstd/src/lib.rs index d256cd527f..5ab051702a 100644 --- a/ulib/axstd/src/lib.rs +++ b/ulib/axstd/src/lib.rs @@ -44,7 +44,7 @@ //! - `log-level-error`, `log-level-warn`, `log-level-info`, `log-level-debug`, //! `log-level-trace`: Keep logging only at the specified level or higher. //! -//! [ArceOS]: https://github.com/rcore-os/arceos +//! [ArceOS]: https://github.com/arceos-org/arceos #![cfg_attr(all(not(test), not(doc)), no_std)] #![feature(doc_cfg)] From f7e266c58585cd78f2635d13dbe36e0a7a633396 Mon Sep 17 00:00:00 2001 From: Yuekai Jia Date: Wed, 10 Jul 2024 01:10:32 +0800 Subject: [PATCH 3/3] Update dependencies versions --- Cargo.lock | 100 ++++++++++++++--------------- api/arceos_posix_api/Cargo.toml | 2 +- crates/allocator/Cargo.toml | 2 +- crates/axfs_vfs/Cargo.toml | 2 +- crates/capability/Cargo.toml | 2 +- crates/driver_pci/Cargo.toml | 2 +- crates/driver_virtio/Cargo.toml | 2 +- crates/page_table_entry/Cargo.toml | 2 +- crates/slab_allocator/Cargo.toml | 2 +- modules/axhal/Cargo.toml | 2 +- 10 files changed, 56 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7daff32f29..1c9543645a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,7 +209,7 @@ dependencies = [ "bindgen", "flatten_objects", "lazy_static", - "spin 0.9.8", + "spin", "static_assertions", ] @@ -341,7 +341,7 @@ version = "0.1.0" dependencies = [ "axfs_vfs", "log", - "spin 0.9.8", + "spin", ] [[package]] @@ -350,7 +350,7 @@ version = "0.1.0" dependencies = [ "axfs_vfs", "log", - "spin 0.9.8", + "spin", ] [[package]] @@ -358,7 +358,7 @@ name = "axfs_vfs" version = "0.1.0" dependencies = [ "axerrno", - "bitflags 2.5.0", + "bitflags 2.6.0", "log", ] @@ -372,7 +372,7 @@ dependencies = [ "axalloc", "axconfig", "axlog", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "crate_interface", "dw_apb_uart", @@ -441,7 +441,7 @@ dependencies = [ "lazy_init", "log", "smoltcp", - "spin 0.9.8", + "spin", ] [[package]] @@ -533,7 +533,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", @@ -546,7 +546,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.66", + "syn 2.0.70", "which", ] @@ -570,9 +570,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmap-allocator" @@ -590,9 +590,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "buddy_system_allocator" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d44d578cadd17312c75e7d0ef489361f160ace58f7139aa32001fee1a51b89b5" +checksum = "a7913f22349ffcfc6ca0ca9a656ec26cfbba538ed49c31a273dff2c5d1ea83d9" [[package]] name = "bumpalo" @@ -611,7 +611,7 @@ name = "capability" version = "0.1.0" dependencies = [ "axerrno", - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -745,7 +745,7 @@ version = "0.1.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -841,7 +841,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -880,7 +880,7 @@ dependencies = [ "driver_common", "ixgbe-driver", "log", - "spin 0.9.8", + "spin", ] [[package]] @@ -954,7 +954,7 @@ name = "fatfs" version = "0.4.0" source = "git+https://github.com/rafalh/rust-fatfs?rev=85f06e0#85f06e08edbd3368e1b0562f2fc1b6d178bf7b8a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", ] @@ -1029,7 +1029,7 @@ dependencies = [ "atomic-polyfill", "hash32", "rustc_version", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -1133,11 +1133,11 @@ version = "0.1.0" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -1255,7 +1255,7 @@ name = "page_table_entry" version = "0.1.0" dependencies = [ "aarch64-cpu", - "bitflags 2.5.0", + "bitflags 2.6.0", "memory_addr", "x86_64 0.15.1", ] @@ -1273,7 +1273,7 @@ dependencies = [ "cfg-if", "kernel_guard", "percpu_macros", - "spin 0.9.8", + "spin", "x86", ] @@ -1283,7 +1283,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1327,7 +1327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1356,9 +1356,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1421,7 +1421,7 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1567,22 +1567,22 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1623,12 +1623,6 @@ dependencies = [ "managed", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -1684,9 +1678,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -1710,7 +1704,7 @@ checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1741,9 +1735,9 @@ checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "toml_datetime", @@ -1756,7 +1750,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1779,11 +1773,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtio-drivers" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f49914233c1d3b612f891e986b0c1e0e8a54d7076a0f2501a5e8a53e7054f" +checksum = "aa40e09453618c7a927c08c5a990497a2954da7c2aaa6c65e0d4f0fc975f6114" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "zerocopy", ] @@ -1843,7 +1837,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -1865,7 +1859,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2050,7 +2044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96cb6fd45bfeab6a5055c5bffdb08768bd0c069f1d946debe585bbb380a7c062" dependencies = [ "bit_field", - "bitflags 2.5.0", + "bitflags 2.6.0", "rustversion", "volatile 0.4.6", ] @@ -2062,7 +2056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bc79523af8abf92fb1a970c3e086c5a343f6bcc1a0eb890f575cbb3b45743df" dependencies = [ "bit_field", - "bitflags 2.5.0", + "bitflags 2.6.0", "rustversion", "volatile 0.4.6", ] @@ -2085,5 +2079,5 @@ checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] diff --git a/api/arceos_posix_api/Cargo.toml b/api/arceos_posix_api/Cargo.toml index ef24e854eb..2195378e69 100644 --- a/api/arceos_posix_api/Cargo.toml +++ b/api/arceos_posix_api/Cargo.toml @@ -47,7 +47,7 @@ axio = { path = "../../crates/axio" } axerrno = { path = "../../crates/axerrno" } static_assertions = "1.1.0" spin = { version = "0.9" } -lazy_static = { version = "1.4", features = ["spin_no_std"] } +lazy_static = { version = "1.5", features = ["spin_no_std"] } flatten_objects = { path = "../../crates/flatten_objects" } [build-dependencies] diff --git a/crates/allocator/Cargo.toml b/crates/allocator/Cargo.toml index bc341c792f..b474b9ae6d 100644 --- a/crates/allocator/Cargo.toml +++ b/crates/allocator/Cargo.toml @@ -22,7 +22,7 @@ buddy = ["dep:buddy_system_allocator"] allocator_api = [] [dependencies] -buddy_system_allocator = { version = "0.9", default-features = false, optional = true } +buddy_system_allocator = { version = "0.10", default-features = false, optional = true } slab_allocator = { path = "../slab_allocator", optional = true } rlsf = { version = "0.2", optional = true } bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator.git", rev = "88e871a", optional = true } diff --git a/crates/axfs_vfs/Cargo.toml b/crates/axfs_vfs/Cargo.toml index a8965925af..f653e4804a 100644 --- a/crates/axfs_vfs/Cargo.toml +++ b/crates/axfs_vfs/Cargo.toml @@ -14,5 +14,5 @@ default = [] [dependencies] log = "0.4" -bitflags = "2.5" +bitflags = "2.6" axerrno = { path = "../axerrno" } diff --git a/crates/capability/Cargo.toml b/crates/capability/Cargo.toml index 76f966ea1a..d59a1c67a3 100644 --- a/crates/capability/Cargo.toml +++ b/crates/capability/Cargo.toml @@ -10,5 +10,5 @@ repository = "https://github.com/arceos-org/arceos/tree/main/crates/capability" documentation = "https://arceos-org.github.io/arceos/capability/index.html" [dependencies] -bitflags = "2.5" +bitflags = "2.6" axerrno = { path = "../axerrno" } diff --git a/crates/driver_pci/Cargo.toml b/crates/driver_pci/Cargo.toml index bce8766e70..1f80d7c084 100644 --- a/crates/driver_pci/Cargo.toml +++ b/crates/driver_pci/Cargo.toml @@ -10,4 +10,4 @@ repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_pci" documentation = "https://arceos-org.github.io/arceos/driver_pci/index.html" [dependencies] -virtio-drivers = "0.7.3" +virtio-drivers = "0.7.4" diff --git a/crates/driver_virtio/Cargo.toml b/crates/driver_virtio/Cargo.toml index eb9a97b791..ddf1bf9e9b 100644 --- a/crates/driver_virtio/Cargo.toml +++ b/crates/driver_virtio/Cargo.toml @@ -19,4 +19,4 @@ driver_common = { path = "../driver_common" } driver_block = { path = "../driver_block", optional = true } driver_net = { path = "../driver_net", optional = true } driver_display = { path = "../driver_display", optional = true} -virtio-drivers = "0.7.3" +virtio-drivers = "0.7.4" diff --git a/crates/page_table_entry/Cargo.toml b/crates/page_table_entry/Cargo.toml index bb723b11eb..0af4172696 100644 --- a/crates/page_table_entry/Cargo.toml +++ b/crates/page_table_entry/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/arceos-org/arceos/tree/main/crates/page_table_e documentation = "https://arceos-org.github.io/arceos/page_table_entry/index.html" [dependencies] -bitflags = "2.5" +bitflags = "2.6" memory_addr = { path = "../memory_addr" } aarch64-cpu = "9.4" # TODO: put it in [target.'cfg(target_arch = "aarch64")'.dependencies] diff --git a/crates/slab_allocator/Cargo.toml b/crates/slab_allocator/Cargo.toml index 039c230c89..c74fe7bde3 100644 --- a/crates/slab_allocator/Cargo.toml +++ b/crates/slab_allocator/Cargo.toml @@ -9,4 +9,4 @@ description = "Slab allocator for `no_std` systems. Uses multiple slabs with blo keywords = ["slab", "allocator", "no_std", "heap", "kernel"] [dependencies] -buddy_system_allocator = { version = "0.9", default-features = false } +buddy_system_allocator = { version = "0.10", default-features = false } diff --git a/modules/axhal/Cargo.toml b/modules/axhal/Cargo.toml index 8ef71d5bb8..f4069cfeeb 100644 --- a/modules/axhal/Cargo.toml +++ b/modules/axhal/Cargo.toml @@ -21,7 +21,7 @@ default = [] [dependencies] log = "0.4" cfg-if = "1.0" -bitflags = "2.5" +bitflags = "2.6" static_assertions = "1.1.0" axlog = { path = "../axlog" } axconfig = { path = "../axconfig" }