Skip to content

Commit 2f69a16

Browse files
committed
Move all crates under crates/
Just organizational cleanup, a number of Rust projects do this: https://github.com/search?q=+%22crates%2F*%22+path%3ACargo.toml+-is%3Afork&type=code&p=5 Signed-off-by: Colin Walters <[email protected]>
1 parent 8836905 commit 2f69a16

File tree

164 files changed

+6
-18
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+6
-18
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
df -h /
104104
# The ostree-container tests
105105
sudo podman run --privileged --pid=host -v /:/run/host -v $(pwd):/src:ro -v /var/tmp:/var/tmp \
106-
-v /run/dbus:/run/dbus -v /run/systemd:/run/systemd localhost/bootc /src/ostree-ext/ci/priv-integration.sh
106+
-v /run/dbus:/run/dbus -v /run/systemd:/run/systemd localhost/bootc /src/crates/ostree-ext/ci/priv-integration.sh
107107
# Nondestructive but privileged tests
108108
sudo bootc-integration-tests host-privileged localhost/bootc-integration
109109
# Install tests

Cargo.toml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
[workspace]
2-
members = [
3-
"cli",
4-
"system-reinstall-bootc",
5-
"lib",
6-
"mount",
7-
"ostree-ext",
8-
"utils",
9-
"blockdev",
10-
"xtask",
11-
"tests-integration",
12-
"tmpfiles",
13-
"sysusers",
14-
]
2+
members = ["crates/*"]
153
resolver = "2"
164

175
[profile.dev]

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ install:
1313
install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/bound-images.d
1414
install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/kargs.d
1515
ln -s /sysroot/ostree/bootc/storage $(DESTDIR)$(prefix)/lib/bootc/storage
16-
install -D -m 0755 cli/bootc-generator-stub $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator
16+
install -D -m 0755 crates/cli/bootc-generator-stub $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator
1717
install -d $(DESTDIR)$(prefix)/lib/bootc/install
1818
# Support installing pre-generated man pages shipped in source tarball, to avoid
1919
# a dependency on pandoc downstream. But in local builds these end up in target/man,
@@ -75,8 +75,8 @@ CLIPPY_CONFIG = -A clippy::all -D clippy::correctness -D clippy::suspicious -Dun
7575
validate-rust:
7676
cargo fmt -- --check -l
7777
cargo test --no-run
78-
(cd ostree-ext && cargo check --no-default-features)
79-
(cd lib && cargo check --no-default-features)
78+
(cd crates/ostree-ext && cargo check --no-default-features)
79+
(cd crates/lib && cargo check --no-default-features)
8080
cargo clippy -- $(CLIPPY_CONFIG)
8181
env RUSTDOCFLAGS='-D warnings' cargo doc --lib
8282
.PHONY: validate-rust
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)