Merge pull request #1413 from cgwalters/crates-refactor

Move all crates under `crates/`

Author: cgwalters

.github/workflows/ci.yml

@@ -103,7 +103,7 @@ jobs:
           df -h /
           # The ostree-container tests
           sudo podman run --privileged --pid=host -v /:/run/host -v $(pwd):/src:ro -v /var/tmp:/var/tmp \
-            -v /run/dbus:/run/dbus -v /run/systemd:/run/systemd localhost/bootc /src/ostree-ext/ci/priv-integration.sh
+            -v /run/dbus:/run/dbus -v /run/systemd:/run/systemd localhost/bootc /src/crates/ostree-ext/ci/priv-integration.sh
           # Nondestructive but privileged tests
           sudo bootc-integration-tests host-privileged localhost/bootc-integration
           # Install tests

Cargo.toml

@@ -1,17 +1,5 @@
 [workspace]
-members = [
-    "cli",
-    "system-reinstall-bootc",
-    "lib",
-    "mount",
-    "ostree-ext",
-    "utils",
-    "blockdev",
-    "xtask",
-    "tests-integration",
-    "tmpfiles",
-    "sysusers",
-]
+members = ["crates/*"]
 resolver = "2"
 
 [profile.dev]

Makefile

@@ -13,7 +13,7 @@ install:
 	install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/bound-images.d
 	install -d -m 0755 $(DESTDIR)$(prefix)/lib/bootc/kargs.d
 	ln -s /sysroot/ostree/bootc/storage $(DESTDIR)$(prefix)/lib/bootc/storage
-	install -D -m 0755 cli/bootc-generator-stub $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator 
+	install -D -m 0755 crates/cli/bootc-generator-stub $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator 
 	install -d $(DESTDIR)$(prefix)/lib/bootc/install
 	# Support installing pre-generated man pages shipped in source tarball, to avoid
 	# 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
 validate-rust:
 	cargo fmt -- --check -l
 	cargo test --no-run
-	(cd ostree-ext && cargo check --no-default-features)
-	(cd lib && cargo check --no-default-features)
+	(cd crates/ostree-ext && cargo check --no-default-features)
+	(cd crates/lib && cargo check --no-default-features)
 	cargo clippy -- $(CLIPPY_CONFIG)
 	env RUSTDOCFLAGS='-D warnings' cargo doc --lib
 .PHONY: validate-rust

blockdev/Cargo.toml renamed to crates/blockdev/Cargo.toml

@@ -5,7 +5,6 @@ version = "0.0.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bootc-dev/bootc"
-readme = "README.md"
 publish = false
 default-run = "bootc"
 

blockdev/src/blockdev.rs renamed to crates/blockdev/src/blockdev.rs

@@ -3,7 +3,6 @@ description = "bootc implementation"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "bootc-lib"
-readme = "README.md"
 repository = "https://github.com/bootc-dev/bootc"
 # The intention is we'll follow semver here, even though this
 # project isn't actually published as a crate.