mirror of
https://github.com/kata-containers/kata-containers.git
synced 2026-07-16 17:04:14 +00:00
dragonball: Group dbs_* crates under crates/
At src/dragonball/, the dragonball crate's own module tree (src/) sat as a sibling of whole separate crates (dbs_acpi/, dbs_pci/, ...). That level mixed one crate's guts with other crates -- neither cleanly one crate nor a clean set of crates. Move the dbs_* under src/dragonball/crates/ so the top level is the dragonball crate plus a crates/ folder of its libraries, matching the layout src/runtime-rs already uses. The dbs_* were imported ~2 years ago from the standalone dragonball-sandbox repo and kept that repo's flat layout verbatim. They are now private to kata (unpublished, versions frozen) -- plain internal workspace members -- so no external consumers are affected and the "independently published building blocks" rationale for the flat layout no longer holds. Pure layout change; no code or build behavior changes. Signed-off-by: Xuewei Niu <niuxuewei.nxw@antgroup.com>
This commit is contained in:
48
Cargo.toml
48
Cargo.toml
@@ -26,18 +26,18 @@ members = [
|
||||
|
||||
# Dragonball
|
||||
"src/dragonball",
|
||||
"src/dragonball/dbs_acpi",
|
||||
"src/dragonball/dbs_address_space",
|
||||
"src/dragonball/dbs_allocator",
|
||||
"src/dragonball/dbs_arch",
|
||||
"src/dragonball/dbs_boot",
|
||||
"src/dragonball/dbs_device",
|
||||
"src/dragonball/dbs_interrupt",
|
||||
"src/dragonball/dbs_legacy_devices",
|
||||
"src/dragonball/dbs_pci",
|
||||
"src/dragonball/dbs_upcall",
|
||||
"src/dragonball/dbs_utils",
|
||||
"src/dragonball/dbs_virtio_devices",
|
||||
"src/dragonball/crates/dbs_acpi",
|
||||
"src/dragonball/crates/dbs_address_space",
|
||||
"src/dragonball/crates/dbs_allocator",
|
||||
"src/dragonball/crates/dbs_arch",
|
||||
"src/dragonball/crates/dbs_boot",
|
||||
"src/dragonball/crates/dbs_device",
|
||||
"src/dragonball/crates/dbs_interrupt",
|
||||
"src/dragonball/crates/dbs_legacy_devices",
|
||||
"src/dragonball/crates/dbs_pci",
|
||||
"src/dragonball/crates/dbs_upcall",
|
||||
"src/dragonball/crates/dbs_utils",
|
||||
"src/dragonball/crates/dbs_virtio_devices",
|
||||
|
||||
# tools
|
||||
"src/tools/agent-ctl",
|
||||
@@ -103,18 +103,18 @@ vmm-sys-util = "0.15.0"
|
||||
|
||||
# Local dependencies from Dragonball Sandbox crates
|
||||
dragonball = { path = "src/dragonball" }
|
||||
dbs-acpi = { path = "src/dragonball/dbs_acpi" }
|
||||
dbs-address-space = { path = "src/dragonball/dbs_address_space" }
|
||||
dbs-allocator = { path = "src/dragonball/dbs_allocator" }
|
||||
dbs-arch = { path = "src/dragonball/dbs_arch" }
|
||||
dbs-boot = { path = "src/dragonball/dbs_boot" }
|
||||
dbs-device = { path = "src/dragonball/dbs_device" }
|
||||
dbs-interrupt = { path = "src/dragonball/dbs_interrupt" }
|
||||
dbs-legacy-devices = { path = "src/dragonball/dbs_legacy_devices" }
|
||||
dbs-pci = { path = "src/dragonball/dbs_pci" }
|
||||
dbs-upcall = { path = "src/dragonball/dbs_upcall" }
|
||||
dbs-utils = { path = "src/dragonball/dbs_utils" }
|
||||
dbs-virtio-devices = { path = "src/dragonball/dbs_virtio_devices" }
|
||||
dbs-acpi = { path = "src/dragonball/crates/dbs_acpi" }
|
||||
dbs-address-space = { path = "src/dragonball/crates/dbs_address_space" }
|
||||
dbs-allocator = { path = "src/dragonball/crates/dbs_allocator" }
|
||||
dbs-arch = { path = "src/dragonball/crates/dbs_arch" }
|
||||
dbs-boot = { path = "src/dragonball/crates/dbs_boot" }
|
||||
dbs-device = { path = "src/dragonball/crates/dbs_device" }
|
||||
dbs-interrupt = { path = "src/dragonball/crates/dbs_interrupt" }
|
||||
dbs-legacy-devices = { path = "src/dragonball/crates/dbs_legacy_devices" }
|
||||
dbs-pci = { path = "src/dragonball/crates/dbs_pci" }
|
||||
dbs-upcall = { path = "src/dragonball/crates/dbs_upcall" }
|
||||
dbs-utils = { path = "src/dragonball/crates/dbs_utils" }
|
||||
dbs-virtio-devices = { path = "src/dragonball/crates/dbs_virtio_devices" }
|
||||
|
||||
# Local dependencies from runtime-rs
|
||||
agent = { path = "src/runtime-rs/crates/agent" }
|
||||
|
||||
@@ -32,7 +32,7 @@ clippy:
|
||||
format:
|
||||
@echo "INFO: rust fmt..."
|
||||
# This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way.
|
||||
rustfmt --edition 2018 ./dbs_address_space/src/lib.rs ./dbs_allocator/src/lib.rs ./dbs_arch/src/lib.rs ./dbs_boot/src/lib.rs ./dbs_device/src/lib.rs ./dbs_interrupt/src/lib.rs ./dbs_legacy_devices/src/lib.rs ./dbs_pci/src/lib.rs ./dbs_upcall/src/lib.rs ./dbs_utils/src/lib.rs ./dbs_virtio_devices/src/lib.rs ./src/lib.rs --check
|
||||
rustfmt --edition 2018 ./crates/dbs_address_space/src/lib.rs ./crates/dbs_allocator/src/lib.rs ./crates/dbs_arch/src/lib.rs ./crates/dbs_boot/src/lib.rs ./crates/dbs_device/src/lib.rs ./crates/dbs_interrupt/src/lib.rs ./crates/dbs_legacy_devices/src/lib.rs ./crates/dbs_pci/src/lib.rs ./crates/dbs_upcall/src/lib.rs ./crates/dbs_utils/src/lib.rs ./crates/dbs_virtio_devices/src/lib.rs ./src/lib.rs --check
|
||||
|
||||
clean:
|
||||
cargo clean
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user