From 883690598eb6063c9dd9f884dde75cd468504ebd Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 16 Jul 2025 14:28:32 -0400 Subject: [PATCH 1/2] crates: Drop `readme = ` We don't actually publish any of these so there's no need for this. --- cli/Cargo.toml | 1 - lib/Cargo.toml | 1 - ostree-ext/Cargo.toml | 1 - system-reinstall-bootc/Cargo.toml | 1 - 4 files changed, 4 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index a7fd75316..959cf15fc 100644 --- a/cli/Cargo.toml +++ b/cli/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" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 540609e76..e87a2a87a 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -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. diff --git a/ostree-ext/Cargo.toml b/ostree-ext/Cargo.toml index 53e8b27d8..5c075c123 100644 --- a/ostree-ext/Cargo.toml +++ b/ostree-ext/Cargo.toml @@ -4,7 +4,6 @@ description = "Extension APIs for OSTree" edition = "2021" license = "MIT OR Apache-2.0" name = "ostree-ext" -readme = "../README.md" repository = "https://github.com/ostreedev/ostree-rs-ext" version = "0.15.3" diff --git a/system-reinstall-bootc/Cargo.toml b/system-reinstall-bootc/Cargo.toml index da630be09..90fcc354f 100644 --- a/system-reinstall-bootc/Cargo.toml +++ b/system-reinstall-bootc/Cargo.toml @@ -4,7 +4,6 @@ version = "0.1.9" edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/bootc-dev/bootc" -readme = "README.md" publish = false # For now don't bump this above what is currently shipped in RHEL9. rust-version = "1.75.0" From 2f69a160749a56b3b698235975541710243423b1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 16 Jul 2025 14:23:52 -0400 Subject: [PATCH 2/2] 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 --- .github/workflows/ci.yml | 2 +- Cargo.toml | 14 +------------- Makefile | 6 +++--- {blockdev => crates/blockdev}/Cargo.toml | 0 {blockdev => crates/blockdev}/src/blockdev.rs | 0 .../blockdev}/tests/fixtures/lsblk.json | 0 {cli => crates/cli}/Cargo.toml | 0 {cli => crates/cli}/bootc-generator-stub | 0 {cli => crates/cli}/src/main.rs | 0 {lib => crates/lib}/Cargo.toml | 0 {lib => crates/lib}/LICENSE-APACHE | 0 {lib => crates/lib}/LICENSE-MIT | 0 {lib => crates/lib}/README.md | 0 {lib => crates/lib}/src/bootloader.rs | 0 {lib => crates/lib}/src/boundimage.rs | 0 {lib => crates/lib}/src/cli.rs | 0 {lib => crates/lib}/src/containerenv.rs | 0 {lib => crates/lib}/src/deploy.rs | 0 {lib => crates/lib}/src/docgen.rs | 0 .../lib}/src/fixtures/spec-booted-pinned.yaml | 0 .../lib}/src/fixtures/spec-only-booted.yaml | 0 .../lib}/src/fixtures/spec-ostree-remote.yaml | 0 .../lib}/src/fixtures/spec-ostree-to-bootc.yaml | 0 .../src/fixtures/spec-rfe-ostree-deployment.yaml | 0 .../lib}/src/fixtures/spec-staged-booted.yaml | 0 .../lib}/src/fixtures/spec-staged-rollback.yaml | 0 .../lib}/src/fixtures/spec-v1-null.json | 0 .../lib}/src/fixtures/spec-v1a1-orig.yaml | 0 {lib => crates/lib}/src/fixtures/spec-v1a1.yaml | 0 .../lib}/src/fixtures/spec-via-local-oci.yaml | 0 {lib => crates/lib}/src/fsck.rs | 0 {lib => crates/lib}/src/generator.rs | 0 {lib => crates/lib}/src/glyph.rs | 0 {lib => crates/lib}/src/image.rs | 0 {lib => crates/lib}/src/imgstorage.rs | 0 {lib => crates/lib}/src/install.rs | 0 {lib => crates/lib}/src/install/baseline.rs | 0 {lib => crates/lib}/src/install/completion.rs | 0 {lib => crates/lib}/src/install/config.rs | 0 {lib => crates/lib}/src/install/osbuild.rs | 0 {lib => crates/lib}/src/install/osconfig.rs | 0 {lib => crates/lib}/src/journal.rs | 0 {lib => crates/lib}/src/k8sapitypes.rs | 0 {lib => crates/lib}/src/kargs.rs | 0 {lib => crates/lib}/src/kernel.rs | 0 {lib => crates/lib}/src/lib.rs | 0 {lib => crates/lib}/src/lints.rs | 2 +- {lib => crates/lib}/src/lsm.rs | 0 {lib => crates/lib}/src/metadata.rs | 0 {lib => crates/lib}/src/podman.rs | 0 {lib => crates/lib}/src/progress_jsonl.rs | 0 {lib => crates/lib}/src/reboot.rs | 0 {lib => crates/lib}/src/reexec.rs | 0 {lib => crates/lib}/src/rhsm.rs | 0 {lib => crates/lib}/src/spec.rs | 0 {lib => crates/lib}/src/status.rs | 0 {lib => crates/lib}/src/store/mod.rs | 0 {lib => crates/lib}/src/store/ostree_container.rs | 0 {lib => crates/lib}/src/systemglue/mod.rs | 0 {lib => crates/lib}/src/task.rs | 0 {lib => crates/lib}/src/utils.rs | 0 {mount => crates/mount}/Cargo.toml | 0 {mount => crates/mount}/src/mount.rs | 0 .../ostree-ext}/.github/workflows/rust.yml | 0 {ostree-ext => crates/ostree-ext}/.gitignore | 0 {ostree-ext => crates/ostree-ext}/Cargo.toml | 0 {ostree-ext => crates/ostree-ext}/LICENSE-APACHE | 0 {ostree-ext => crates/ostree-ext}/LICENSE-MIT | 0 {ostree-ext => crates/ostree-ext}/README.md | 0 .../ostree-ext}/ci/container-build-integration.sh | 0 {ostree-ext => crates/ostree-ext}/ci/ima.sh | 0 .../ostree-ext}/ci/installdeps.sh | 0 .../ostree-ext}/ci/integration.sh | 0 {ostree-ext => crates/ostree-ext}/ci/lints.sh | 0 .../ostree-ext}/ci/priv-integration.sh | 0 .../ostree-ext}/ci/priv-test-cockpit-selinux.sh | 0 {ostree-ext => crates/ostree-ext}/deny.toml | 0 .../ostree-ext}/docs/container-image-import.dot | 0 .../ostree-ext}/docs/container-image-import.svg | 0 .../ostree-ext}/docs/questions-and-answers.md | 0 .../ostree-ext}/man/ostree-container-auth.md | 0 .../ostree-ext}/ostree-and-containers.md | 0 .../ostree-ext}/src/bootabletree.rs | 0 {ostree-ext => crates/ostree-ext}/src/chunking.rs | 0 {ostree-ext => crates/ostree-ext}/src/cli.rs | 0 {ostree-ext => crates/ostree-ext}/src/commit.rs | 0 .../ostree-ext}/src/container/deploy.rs | 0 .../ostree-ext}/src/container/encapsulate.rs | 0 .../ostree-ext}/src/container/mod.rs | 0 .../ostree-ext}/src/container/skopeo.rs | 0 .../ostree-ext}/src/container/store.rs | 0 .../container/tests/it/fixtures/exampleos.tar.zst | Bin .../ostree-ext}/src/container/unencapsulate.rs | 0 .../src/container/update_detachedmeta.rs | 0 .../ostree-ext}/src/container_utils.rs | 0 {ostree-ext => crates/ostree-ext}/src/diff.rs | 0 {ostree-ext => crates/ostree-ext}/src/docgen.rs | 0 {ostree-ext => crates/ostree-ext}/src/fixture.rs | 0 .../fixtures/fedora-coreos-contentmeta.json.gz | Bin .../src/fixtures/ostree-gpg-test-home.tar.gz | Bin {ostree-ext => crates/ostree-ext}/src/fsverity.rs | 0 {ostree-ext => crates/ostree-ext}/src/globals.rs | 0 {ostree-ext => crates/ostree-ext}/src/ima.rs | 0 .../ostree-ext}/src/integrationtest.rs | 0 .../ostree-ext}/src/isolation.rs | 0 .../ostree-ext}/src/keyfileext.rs | 0 {ostree-ext => crates/ostree-ext}/src/lib.rs | 0 {ostree-ext => crates/ostree-ext}/src/logging.rs | 0 .../ostree-ext}/src/objectsource.rs | 0 {ostree-ext => crates/ostree-ext}/src/objgv.rs | 0 .../ostree-ext}/src/ostree_manual.rs | 0 .../ostree-ext}/src/ostree_prepareroot.rs | 0 .../ostree-ext}/src/refescape.rs | 0 {ostree-ext => crates/ostree-ext}/src/repair.rs | 0 {ostree-ext => crates/ostree-ext}/src/selinux.rs | 0 .../ostree-ext}/src/statistics.rs | 0 {ostree-ext => crates/ostree-ext}/src/sysroot.rs | 0 .../ostree-ext}/src/tar/export.rs | 0 .../ostree-ext}/src/tar/import.rs | 0 {ostree-ext => crates/ostree-ext}/src/tar/mod.rs | 0 .../ostree-ext}/src/tar/write.rs | 0 .../ostree-ext}/src/tokio_util.rs | 0 {ostree-ext => crates/ostree-ext}/src/utils.rs | 0 .../ostree-ext}/tests/it/fixtures/hlinks.tar.gz | Bin .../ostree-ext}/tests/it/fixtures/manifest1.json | 0 .../ostree-ext}/tests/it/fixtures/manifest2.json | 0 .../ostree-ext}/tests/it/main.rs | 0 .../system-reinstall-bootc}/Cargo.toml | 0 .../system-reinstall-bootc}/sample_config.yaml | 0 .../system-reinstall-bootc}/src/btrfs.rs | 0 .../system-reinstall-bootc}/src/config/cli.rs | 0 .../system-reinstall-bootc}/src/config/mod.rs | 0 .../system-reinstall-bootc}/src/lvm.rs | 0 .../system-reinstall-bootc}/src/main.rs | 0 .../system-reinstall-bootc}/src/podman.rs | 0 .../system-reinstall-bootc}/src/prompt.rs | 0 .../system-reinstall-bootc}/src/users.rs | 0 .../tests/fixtures/loginctl.json | 0 {sysusers => crates/sysusers}/Cargo.toml | 0 {sysusers => crates/sysusers}/src/lib.rs | 0 .../sysusers}/src/nameservice/group.rs | 0 .../sysusers}/src/nameservice/mod.rs | 0 .../sysusers}/src/nameservice/passwd.rs | 0 .../sysusers}/src/nameservice/shadow.rs | 0 .../tests-integration}/Cargo.toml | 0 .../tests-integration}/README.md | 0 .../tests-integration}/src/container.rs | 0 .../tests-integration}/src/hostpriv.rs | 0 .../tests-integration}/src/install.rs | 0 .../tests-integration}/src/runvm.rs | 0 .../tests-integration}/src/selinux.rs | 0 .../tests-integration}/src/system_reinstall.rs | 0 .../tests-integration}/src/tests-integration.rs | 0 {tmpfiles => crates/tmpfiles}/Cargo.toml | 0 {tmpfiles => crates/tmpfiles}/src/lib.rs | 0 {utils => crates/utils}/Cargo.toml | 0 {utils => crates/utils}/src/command.rs | 0 {utils => crates/utils}/src/iterators.rs | 0 {utils => crates/utils}/src/lib.rs | 0 {utils => crates/utils}/src/path.rs | 0 {utils => crates/utils}/src/timestamp.rs | 0 {utils => crates/utils}/src/tracing_util.rs | 0 {xtask => crates/xtask}/Cargo.toml | 0 {xtask => crates/xtask}/src/xtask.rs | 0 164 files changed, 6 insertions(+), 18 deletions(-) rename {blockdev => crates/blockdev}/Cargo.toml (100%) rename {blockdev => crates/blockdev}/src/blockdev.rs (100%) rename {blockdev => crates/blockdev}/tests/fixtures/lsblk.json (100%) rename {cli => crates/cli}/Cargo.toml (100%) rename {cli => crates/cli}/bootc-generator-stub (100%) rename {cli => crates/cli}/src/main.rs (100%) rename {lib => crates/lib}/Cargo.toml (100%) rename {lib => crates/lib}/LICENSE-APACHE (100%) rename {lib => crates/lib}/LICENSE-MIT (100%) rename {lib => crates/lib}/README.md (100%) rename {lib => crates/lib}/src/bootloader.rs (100%) rename {lib => crates/lib}/src/boundimage.rs (100%) rename {lib => crates/lib}/src/cli.rs (100%) rename {lib => crates/lib}/src/containerenv.rs (100%) rename {lib => crates/lib}/src/deploy.rs (100%) rename {lib => crates/lib}/src/docgen.rs (100%) rename {lib => crates/lib}/src/fixtures/spec-booted-pinned.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-only-booted.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-ostree-remote.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-ostree-to-bootc.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-rfe-ostree-deployment.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-staged-booted.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-staged-rollback.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-v1-null.json (100%) rename {lib => crates/lib}/src/fixtures/spec-v1a1-orig.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-v1a1.yaml (100%) rename {lib => crates/lib}/src/fixtures/spec-via-local-oci.yaml (100%) rename {lib => crates/lib}/src/fsck.rs (100%) rename {lib => crates/lib}/src/generator.rs (100%) rename {lib => crates/lib}/src/glyph.rs (100%) rename {lib => crates/lib}/src/image.rs (100%) rename {lib => crates/lib}/src/imgstorage.rs (100%) rename {lib => crates/lib}/src/install.rs (100%) rename {lib => crates/lib}/src/install/baseline.rs (100%) rename {lib => crates/lib}/src/install/completion.rs (100%) rename {lib => crates/lib}/src/install/config.rs (100%) rename {lib => crates/lib}/src/install/osbuild.rs (100%) rename {lib => crates/lib}/src/install/osconfig.rs (100%) rename {lib => crates/lib}/src/journal.rs (100%) rename {lib => crates/lib}/src/k8sapitypes.rs (100%) rename {lib => crates/lib}/src/kargs.rs (100%) rename {lib => crates/lib}/src/kernel.rs (100%) rename {lib => crates/lib}/src/lib.rs (100%) rename {lib => crates/lib}/src/lints.rs (99%) rename {lib => crates/lib}/src/lsm.rs (100%) rename {lib => crates/lib}/src/metadata.rs (100%) rename {lib => crates/lib}/src/podman.rs (100%) rename {lib => crates/lib}/src/progress_jsonl.rs (100%) rename {lib => crates/lib}/src/reboot.rs (100%) rename {lib => crates/lib}/src/reexec.rs (100%) rename {lib => crates/lib}/src/rhsm.rs (100%) rename {lib => crates/lib}/src/spec.rs (100%) rename {lib => crates/lib}/src/status.rs (100%) rename {lib => crates/lib}/src/store/mod.rs (100%) rename {lib => crates/lib}/src/store/ostree_container.rs (100%) rename {lib => crates/lib}/src/systemglue/mod.rs (100%) rename {lib => crates/lib}/src/task.rs (100%) rename {lib => crates/lib}/src/utils.rs (100%) rename {mount => crates/mount}/Cargo.toml (100%) rename {mount => crates/mount}/src/mount.rs (100%) rename {ostree-ext => crates/ostree-ext}/.github/workflows/rust.yml (100%) rename {ostree-ext => crates/ostree-ext}/.gitignore (100%) rename {ostree-ext => crates/ostree-ext}/Cargo.toml (100%) rename {ostree-ext => crates/ostree-ext}/LICENSE-APACHE (100%) rename {ostree-ext => crates/ostree-ext}/LICENSE-MIT (100%) rename {ostree-ext => crates/ostree-ext}/README.md (100%) rename {ostree-ext => crates/ostree-ext}/ci/container-build-integration.sh (100%) rename {ostree-ext => crates/ostree-ext}/ci/ima.sh (100%) rename {ostree-ext => crates/ostree-ext}/ci/installdeps.sh (100%) rename {ostree-ext => crates/ostree-ext}/ci/integration.sh (100%) rename {ostree-ext => crates/ostree-ext}/ci/lints.sh (100%) rename {ostree-ext => crates/ostree-ext}/ci/priv-integration.sh (100%) rename {ostree-ext => crates/ostree-ext}/ci/priv-test-cockpit-selinux.sh (100%) rename {ostree-ext => crates/ostree-ext}/deny.toml (100%) rename {ostree-ext => crates/ostree-ext}/docs/container-image-import.dot (100%) rename {ostree-ext => crates/ostree-ext}/docs/container-image-import.svg (100%) rename {ostree-ext => crates/ostree-ext}/docs/questions-and-answers.md (100%) rename {ostree-ext => crates/ostree-ext}/man/ostree-container-auth.md (100%) rename {ostree-ext => crates/ostree-ext}/ostree-and-containers.md (100%) rename {ostree-ext => crates/ostree-ext}/src/bootabletree.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/chunking.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/cli.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/commit.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container/deploy.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container/encapsulate.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container/mod.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container/skopeo.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container/store.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container/tests/it/fixtures/exampleos.tar.zst (100%) rename {ostree-ext => crates/ostree-ext}/src/container/unencapsulate.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container/update_detachedmeta.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/container_utils.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/diff.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/docgen.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/fixture.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/fixtures/fedora-coreos-contentmeta.json.gz (100%) rename {ostree-ext => crates/ostree-ext}/src/fixtures/ostree-gpg-test-home.tar.gz (100%) rename {ostree-ext => crates/ostree-ext}/src/fsverity.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/globals.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/ima.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/integrationtest.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/isolation.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/keyfileext.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/lib.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/logging.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/objectsource.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/objgv.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/ostree_manual.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/ostree_prepareroot.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/refescape.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/repair.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/selinux.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/statistics.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/sysroot.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/tar/export.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/tar/import.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/tar/mod.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/tar/write.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/tokio_util.rs (100%) rename {ostree-ext => crates/ostree-ext}/src/utils.rs (100%) rename {ostree-ext => crates/ostree-ext}/tests/it/fixtures/hlinks.tar.gz (100%) rename {ostree-ext => crates/ostree-ext}/tests/it/fixtures/manifest1.json (100%) rename {ostree-ext => crates/ostree-ext}/tests/it/fixtures/manifest2.json (100%) rename {ostree-ext => crates/ostree-ext}/tests/it/main.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/Cargo.toml (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/sample_config.yaml (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/btrfs.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/config/cli.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/config/mod.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/lvm.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/main.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/podman.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/prompt.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/src/users.rs (100%) rename {system-reinstall-bootc => crates/system-reinstall-bootc}/tests/fixtures/loginctl.json (100%) rename {sysusers => crates/sysusers}/Cargo.toml (100%) rename {sysusers => crates/sysusers}/src/lib.rs (100%) rename {sysusers => crates/sysusers}/src/nameservice/group.rs (100%) rename {sysusers => crates/sysusers}/src/nameservice/mod.rs (100%) rename {sysusers => crates/sysusers}/src/nameservice/passwd.rs (100%) rename {sysusers => crates/sysusers}/src/nameservice/shadow.rs (100%) rename {tests-integration => crates/tests-integration}/Cargo.toml (100%) rename {tests-integration => crates/tests-integration}/README.md (100%) rename {tests-integration => crates/tests-integration}/src/container.rs (100%) rename {tests-integration => crates/tests-integration}/src/hostpriv.rs (100%) rename {tests-integration => crates/tests-integration}/src/install.rs (100%) rename {tests-integration => crates/tests-integration}/src/runvm.rs (100%) rename {tests-integration => crates/tests-integration}/src/selinux.rs (100%) rename {tests-integration => crates/tests-integration}/src/system_reinstall.rs (100%) rename {tests-integration => crates/tests-integration}/src/tests-integration.rs (100%) rename {tmpfiles => crates/tmpfiles}/Cargo.toml (100%) rename {tmpfiles => crates/tmpfiles}/src/lib.rs (100%) rename {utils => crates/utils}/Cargo.toml (100%) rename {utils => crates/utils}/src/command.rs (100%) rename {utils => crates/utils}/src/iterators.rs (100%) rename {utils => crates/utils}/src/lib.rs (100%) rename {utils => crates/utils}/src/path.rs (100%) rename {utils => crates/utils}/src/timestamp.rs (100%) rename {utils => crates/utils}/src/tracing_util.rs (100%) rename {xtask => crates/xtask}/Cargo.toml (100%) rename {xtask => crates/xtask}/src/xtask.rs (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad9a4b7c9..e8701e3e7 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/Cargo.toml b/Cargo.toml index 3e41bd575..6dd8ee7b0 100644 --- a/Cargo.toml +++ b/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] diff --git a/Makefile b/Makefile index 44ab6af15..b0ef7b3d5 100644 --- a/Makefile +++ b/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 diff --git a/blockdev/Cargo.toml b/crates/blockdev/Cargo.toml similarity index 100% rename from blockdev/Cargo.toml rename to crates/blockdev/Cargo.toml diff --git a/blockdev/src/blockdev.rs b/crates/blockdev/src/blockdev.rs similarity index 100% rename from blockdev/src/blockdev.rs rename to crates/blockdev/src/blockdev.rs diff --git a/blockdev/tests/fixtures/lsblk.json b/crates/blockdev/tests/fixtures/lsblk.json similarity index 100% rename from blockdev/tests/fixtures/lsblk.json rename to crates/blockdev/tests/fixtures/lsblk.json diff --git a/cli/Cargo.toml b/crates/cli/Cargo.toml similarity index 100% rename from cli/Cargo.toml rename to crates/cli/Cargo.toml diff --git a/cli/bootc-generator-stub b/crates/cli/bootc-generator-stub similarity index 100% rename from cli/bootc-generator-stub rename to crates/cli/bootc-generator-stub diff --git a/cli/src/main.rs b/crates/cli/src/main.rs similarity index 100% rename from cli/src/main.rs rename to crates/cli/src/main.rs diff --git a/lib/Cargo.toml b/crates/lib/Cargo.toml similarity index 100% rename from lib/Cargo.toml rename to crates/lib/Cargo.toml diff --git a/lib/LICENSE-APACHE b/crates/lib/LICENSE-APACHE similarity index 100% rename from lib/LICENSE-APACHE rename to crates/lib/LICENSE-APACHE diff --git a/lib/LICENSE-MIT b/crates/lib/LICENSE-MIT similarity index 100% rename from lib/LICENSE-MIT rename to crates/lib/LICENSE-MIT diff --git a/lib/README.md b/crates/lib/README.md similarity index 100% rename from lib/README.md rename to crates/lib/README.md diff --git a/lib/src/bootloader.rs b/crates/lib/src/bootloader.rs similarity index 100% rename from lib/src/bootloader.rs rename to crates/lib/src/bootloader.rs diff --git a/lib/src/boundimage.rs b/crates/lib/src/boundimage.rs similarity index 100% rename from lib/src/boundimage.rs rename to crates/lib/src/boundimage.rs diff --git a/lib/src/cli.rs b/crates/lib/src/cli.rs similarity index 100% rename from lib/src/cli.rs rename to crates/lib/src/cli.rs diff --git a/lib/src/containerenv.rs b/crates/lib/src/containerenv.rs similarity index 100% rename from lib/src/containerenv.rs rename to crates/lib/src/containerenv.rs diff --git a/lib/src/deploy.rs b/crates/lib/src/deploy.rs similarity index 100% rename from lib/src/deploy.rs rename to crates/lib/src/deploy.rs diff --git a/lib/src/docgen.rs b/crates/lib/src/docgen.rs similarity index 100% rename from lib/src/docgen.rs rename to crates/lib/src/docgen.rs diff --git a/lib/src/fixtures/spec-booted-pinned.yaml b/crates/lib/src/fixtures/spec-booted-pinned.yaml similarity index 100% rename from lib/src/fixtures/spec-booted-pinned.yaml rename to crates/lib/src/fixtures/spec-booted-pinned.yaml diff --git a/lib/src/fixtures/spec-only-booted.yaml b/crates/lib/src/fixtures/spec-only-booted.yaml similarity index 100% rename from lib/src/fixtures/spec-only-booted.yaml rename to crates/lib/src/fixtures/spec-only-booted.yaml diff --git a/lib/src/fixtures/spec-ostree-remote.yaml b/crates/lib/src/fixtures/spec-ostree-remote.yaml similarity index 100% rename from lib/src/fixtures/spec-ostree-remote.yaml rename to crates/lib/src/fixtures/spec-ostree-remote.yaml diff --git a/lib/src/fixtures/spec-ostree-to-bootc.yaml b/crates/lib/src/fixtures/spec-ostree-to-bootc.yaml similarity index 100% rename from lib/src/fixtures/spec-ostree-to-bootc.yaml rename to crates/lib/src/fixtures/spec-ostree-to-bootc.yaml diff --git a/lib/src/fixtures/spec-rfe-ostree-deployment.yaml b/crates/lib/src/fixtures/spec-rfe-ostree-deployment.yaml similarity index 100% rename from lib/src/fixtures/spec-rfe-ostree-deployment.yaml rename to crates/lib/src/fixtures/spec-rfe-ostree-deployment.yaml diff --git a/lib/src/fixtures/spec-staged-booted.yaml b/crates/lib/src/fixtures/spec-staged-booted.yaml similarity index 100% rename from lib/src/fixtures/spec-staged-booted.yaml rename to crates/lib/src/fixtures/spec-staged-booted.yaml diff --git a/lib/src/fixtures/spec-staged-rollback.yaml b/crates/lib/src/fixtures/spec-staged-rollback.yaml similarity index 100% rename from lib/src/fixtures/spec-staged-rollback.yaml rename to crates/lib/src/fixtures/spec-staged-rollback.yaml diff --git a/lib/src/fixtures/spec-v1-null.json b/crates/lib/src/fixtures/spec-v1-null.json similarity index 100% rename from lib/src/fixtures/spec-v1-null.json rename to crates/lib/src/fixtures/spec-v1-null.json diff --git a/lib/src/fixtures/spec-v1a1-orig.yaml b/crates/lib/src/fixtures/spec-v1a1-orig.yaml similarity index 100% rename from lib/src/fixtures/spec-v1a1-orig.yaml rename to crates/lib/src/fixtures/spec-v1a1-orig.yaml diff --git a/lib/src/fixtures/spec-v1a1.yaml b/crates/lib/src/fixtures/spec-v1a1.yaml similarity index 100% rename from lib/src/fixtures/spec-v1a1.yaml rename to crates/lib/src/fixtures/spec-v1a1.yaml diff --git a/lib/src/fixtures/spec-via-local-oci.yaml b/crates/lib/src/fixtures/spec-via-local-oci.yaml similarity index 100% rename from lib/src/fixtures/spec-via-local-oci.yaml rename to crates/lib/src/fixtures/spec-via-local-oci.yaml diff --git a/lib/src/fsck.rs b/crates/lib/src/fsck.rs similarity index 100% rename from lib/src/fsck.rs rename to crates/lib/src/fsck.rs diff --git a/lib/src/generator.rs b/crates/lib/src/generator.rs similarity index 100% rename from lib/src/generator.rs rename to crates/lib/src/generator.rs diff --git a/lib/src/glyph.rs b/crates/lib/src/glyph.rs similarity index 100% rename from lib/src/glyph.rs rename to crates/lib/src/glyph.rs diff --git a/lib/src/image.rs b/crates/lib/src/image.rs similarity index 100% rename from lib/src/image.rs rename to crates/lib/src/image.rs diff --git a/lib/src/imgstorage.rs b/crates/lib/src/imgstorage.rs similarity index 100% rename from lib/src/imgstorage.rs rename to crates/lib/src/imgstorage.rs diff --git a/lib/src/install.rs b/crates/lib/src/install.rs similarity index 100% rename from lib/src/install.rs rename to crates/lib/src/install.rs diff --git a/lib/src/install/baseline.rs b/crates/lib/src/install/baseline.rs similarity index 100% rename from lib/src/install/baseline.rs rename to crates/lib/src/install/baseline.rs diff --git a/lib/src/install/completion.rs b/crates/lib/src/install/completion.rs similarity index 100% rename from lib/src/install/completion.rs rename to crates/lib/src/install/completion.rs diff --git a/lib/src/install/config.rs b/crates/lib/src/install/config.rs similarity index 100% rename from lib/src/install/config.rs rename to crates/lib/src/install/config.rs diff --git a/lib/src/install/osbuild.rs b/crates/lib/src/install/osbuild.rs similarity index 100% rename from lib/src/install/osbuild.rs rename to crates/lib/src/install/osbuild.rs diff --git a/lib/src/install/osconfig.rs b/crates/lib/src/install/osconfig.rs similarity index 100% rename from lib/src/install/osconfig.rs rename to crates/lib/src/install/osconfig.rs diff --git a/lib/src/journal.rs b/crates/lib/src/journal.rs similarity index 100% rename from lib/src/journal.rs rename to crates/lib/src/journal.rs diff --git a/lib/src/k8sapitypes.rs b/crates/lib/src/k8sapitypes.rs similarity index 100% rename from lib/src/k8sapitypes.rs rename to crates/lib/src/k8sapitypes.rs diff --git a/lib/src/kargs.rs b/crates/lib/src/kargs.rs similarity index 100% rename from lib/src/kargs.rs rename to crates/lib/src/kargs.rs diff --git a/lib/src/kernel.rs b/crates/lib/src/kernel.rs similarity index 100% rename from lib/src/kernel.rs rename to crates/lib/src/kernel.rs diff --git a/lib/src/lib.rs b/crates/lib/src/lib.rs similarity index 100% rename from lib/src/lib.rs rename to crates/lib/src/lib.rs diff --git a/lib/src/lints.rs b/crates/lib/src/lints.rs similarity index 99% rename from lib/src/lints.rs rename to crates/lib/src/lints.rs index b0a1e1c6d..9dff48cb4 100644 --- a/lib/src/lints.rs +++ b/crates/lib/src/lints.rs @@ -806,7 +806,7 @@ mod tests { const PREPAREROOT_PATH: &str = "usr/lib/ostree/prepare-root.conf"; const PREPAREROOT: &str = - include_str!("../../baseimage/base/usr/lib/ostree/prepare-root.conf"); + include_str!("../../../baseimage/base/usr/lib/ostree/prepare-root.conf"); root.create_dir_all(Utf8Path::new(PREPAREROOT_PATH).parent().unwrap())?; root.atomic_write(PREPAREROOT_PATH, PREPAREROOT)?; diff --git a/lib/src/lsm.rs b/crates/lib/src/lsm.rs similarity index 100% rename from lib/src/lsm.rs rename to crates/lib/src/lsm.rs diff --git a/lib/src/metadata.rs b/crates/lib/src/metadata.rs similarity index 100% rename from lib/src/metadata.rs rename to crates/lib/src/metadata.rs diff --git a/lib/src/podman.rs b/crates/lib/src/podman.rs similarity index 100% rename from lib/src/podman.rs rename to crates/lib/src/podman.rs diff --git a/lib/src/progress_jsonl.rs b/crates/lib/src/progress_jsonl.rs similarity index 100% rename from lib/src/progress_jsonl.rs rename to crates/lib/src/progress_jsonl.rs diff --git a/lib/src/reboot.rs b/crates/lib/src/reboot.rs similarity index 100% rename from lib/src/reboot.rs rename to crates/lib/src/reboot.rs diff --git a/lib/src/reexec.rs b/crates/lib/src/reexec.rs similarity index 100% rename from lib/src/reexec.rs rename to crates/lib/src/reexec.rs diff --git a/lib/src/rhsm.rs b/crates/lib/src/rhsm.rs similarity index 100% rename from lib/src/rhsm.rs rename to crates/lib/src/rhsm.rs diff --git a/lib/src/spec.rs b/crates/lib/src/spec.rs similarity index 100% rename from lib/src/spec.rs rename to crates/lib/src/spec.rs diff --git a/lib/src/status.rs b/crates/lib/src/status.rs similarity index 100% rename from lib/src/status.rs rename to crates/lib/src/status.rs diff --git a/lib/src/store/mod.rs b/crates/lib/src/store/mod.rs similarity index 100% rename from lib/src/store/mod.rs rename to crates/lib/src/store/mod.rs diff --git a/lib/src/store/ostree_container.rs b/crates/lib/src/store/ostree_container.rs similarity index 100% rename from lib/src/store/ostree_container.rs rename to crates/lib/src/store/ostree_container.rs diff --git a/lib/src/systemglue/mod.rs b/crates/lib/src/systemglue/mod.rs similarity index 100% rename from lib/src/systemglue/mod.rs rename to crates/lib/src/systemglue/mod.rs diff --git a/lib/src/task.rs b/crates/lib/src/task.rs similarity index 100% rename from lib/src/task.rs rename to crates/lib/src/task.rs diff --git a/lib/src/utils.rs b/crates/lib/src/utils.rs similarity index 100% rename from lib/src/utils.rs rename to crates/lib/src/utils.rs diff --git a/mount/Cargo.toml b/crates/mount/Cargo.toml similarity index 100% rename from mount/Cargo.toml rename to crates/mount/Cargo.toml diff --git a/mount/src/mount.rs b/crates/mount/src/mount.rs similarity index 100% rename from mount/src/mount.rs rename to crates/mount/src/mount.rs diff --git a/ostree-ext/.github/workflows/rust.yml b/crates/ostree-ext/.github/workflows/rust.yml similarity index 100% rename from ostree-ext/.github/workflows/rust.yml rename to crates/ostree-ext/.github/workflows/rust.yml diff --git a/ostree-ext/.gitignore b/crates/ostree-ext/.gitignore similarity index 100% rename from ostree-ext/.gitignore rename to crates/ostree-ext/.gitignore diff --git a/ostree-ext/Cargo.toml b/crates/ostree-ext/Cargo.toml similarity index 100% rename from ostree-ext/Cargo.toml rename to crates/ostree-ext/Cargo.toml diff --git a/ostree-ext/LICENSE-APACHE b/crates/ostree-ext/LICENSE-APACHE similarity index 100% rename from ostree-ext/LICENSE-APACHE rename to crates/ostree-ext/LICENSE-APACHE diff --git a/ostree-ext/LICENSE-MIT b/crates/ostree-ext/LICENSE-MIT similarity index 100% rename from ostree-ext/LICENSE-MIT rename to crates/ostree-ext/LICENSE-MIT diff --git a/ostree-ext/README.md b/crates/ostree-ext/README.md similarity index 100% rename from ostree-ext/README.md rename to crates/ostree-ext/README.md diff --git a/ostree-ext/ci/container-build-integration.sh b/crates/ostree-ext/ci/container-build-integration.sh similarity index 100% rename from ostree-ext/ci/container-build-integration.sh rename to crates/ostree-ext/ci/container-build-integration.sh diff --git a/ostree-ext/ci/ima.sh b/crates/ostree-ext/ci/ima.sh similarity index 100% rename from ostree-ext/ci/ima.sh rename to crates/ostree-ext/ci/ima.sh diff --git a/ostree-ext/ci/installdeps.sh b/crates/ostree-ext/ci/installdeps.sh similarity index 100% rename from ostree-ext/ci/installdeps.sh rename to crates/ostree-ext/ci/installdeps.sh diff --git a/ostree-ext/ci/integration.sh b/crates/ostree-ext/ci/integration.sh similarity index 100% rename from ostree-ext/ci/integration.sh rename to crates/ostree-ext/ci/integration.sh diff --git a/ostree-ext/ci/lints.sh b/crates/ostree-ext/ci/lints.sh similarity index 100% rename from ostree-ext/ci/lints.sh rename to crates/ostree-ext/ci/lints.sh diff --git a/ostree-ext/ci/priv-integration.sh b/crates/ostree-ext/ci/priv-integration.sh similarity index 100% rename from ostree-ext/ci/priv-integration.sh rename to crates/ostree-ext/ci/priv-integration.sh diff --git a/ostree-ext/ci/priv-test-cockpit-selinux.sh b/crates/ostree-ext/ci/priv-test-cockpit-selinux.sh similarity index 100% rename from ostree-ext/ci/priv-test-cockpit-selinux.sh rename to crates/ostree-ext/ci/priv-test-cockpit-selinux.sh diff --git a/ostree-ext/deny.toml b/crates/ostree-ext/deny.toml similarity index 100% rename from ostree-ext/deny.toml rename to crates/ostree-ext/deny.toml diff --git a/ostree-ext/docs/container-image-import.dot b/crates/ostree-ext/docs/container-image-import.dot similarity index 100% rename from ostree-ext/docs/container-image-import.dot rename to crates/ostree-ext/docs/container-image-import.dot diff --git a/ostree-ext/docs/container-image-import.svg b/crates/ostree-ext/docs/container-image-import.svg similarity index 100% rename from ostree-ext/docs/container-image-import.svg rename to crates/ostree-ext/docs/container-image-import.svg diff --git a/ostree-ext/docs/questions-and-answers.md b/crates/ostree-ext/docs/questions-and-answers.md similarity index 100% rename from ostree-ext/docs/questions-and-answers.md rename to crates/ostree-ext/docs/questions-and-answers.md diff --git a/ostree-ext/man/ostree-container-auth.md b/crates/ostree-ext/man/ostree-container-auth.md similarity index 100% rename from ostree-ext/man/ostree-container-auth.md rename to crates/ostree-ext/man/ostree-container-auth.md diff --git a/ostree-ext/ostree-and-containers.md b/crates/ostree-ext/ostree-and-containers.md similarity index 100% rename from ostree-ext/ostree-and-containers.md rename to crates/ostree-ext/ostree-and-containers.md diff --git a/ostree-ext/src/bootabletree.rs b/crates/ostree-ext/src/bootabletree.rs similarity index 100% rename from ostree-ext/src/bootabletree.rs rename to crates/ostree-ext/src/bootabletree.rs diff --git a/ostree-ext/src/chunking.rs b/crates/ostree-ext/src/chunking.rs similarity index 100% rename from ostree-ext/src/chunking.rs rename to crates/ostree-ext/src/chunking.rs diff --git a/ostree-ext/src/cli.rs b/crates/ostree-ext/src/cli.rs similarity index 100% rename from ostree-ext/src/cli.rs rename to crates/ostree-ext/src/cli.rs diff --git a/ostree-ext/src/commit.rs b/crates/ostree-ext/src/commit.rs similarity index 100% rename from ostree-ext/src/commit.rs rename to crates/ostree-ext/src/commit.rs diff --git a/ostree-ext/src/container/deploy.rs b/crates/ostree-ext/src/container/deploy.rs similarity index 100% rename from ostree-ext/src/container/deploy.rs rename to crates/ostree-ext/src/container/deploy.rs diff --git a/ostree-ext/src/container/encapsulate.rs b/crates/ostree-ext/src/container/encapsulate.rs similarity index 100% rename from ostree-ext/src/container/encapsulate.rs rename to crates/ostree-ext/src/container/encapsulate.rs diff --git a/ostree-ext/src/container/mod.rs b/crates/ostree-ext/src/container/mod.rs similarity index 100% rename from ostree-ext/src/container/mod.rs rename to crates/ostree-ext/src/container/mod.rs diff --git a/ostree-ext/src/container/skopeo.rs b/crates/ostree-ext/src/container/skopeo.rs similarity index 100% rename from ostree-ext/src/container/skopeo.rs rename to crates/ostree-ext/src/container/skopeo.rs diff --git a/ostree-ext/src/container/store.rs b/crates/ostree-ext/src/container/store.rs similarity index 100% rename from ostree-ext/src/container/store.rs rename to crates/ostree-ext/src/container/store.rs diff --git a/ostree-ext/src/container/tests/it/fixtures/exampleos.tar.zst b/crates/ostree-ext/src/container/tests/it/fixtures/exampleos.tar.zst similarity index 100% rename from ostree-ext/src/container/tests/it/fixtures/exampleos.tar.zst rename to crates/ostree-ext/src/container/tests/it/fixtures/exampleos.tar.zst diff --git a/ostree-ext/src/container/unencapsulate.rs b/crates/ostree-ext/src/container/unencapsulate.rs similarity index 100% rename from ostree-ext/src/container/unencapsulate.rs rename to crates/ostree-ext/src/container/unencapsulate.rs diff --git a/ostree-ext/src/container/update_detachedmeta.rs b/crates/ostree-ext/src/container/update_detachedmeta.rs similarity index 100% rename from ostree-ext/src/container/update_detachedmeta.rs rename to crates/ostree-ext/src/container/update_detachedmeta.rs diff --git a/ostree-ext/src/container_utils.rs b/crates/ostree-ext/src/container_utils.rs similarity index 100% rename from ostree-ext/src/container_utils.rs rename to crates/ostree-ext/src/container_utils.rs diff --git a/ostree-ext/src/diff.rs b/crates/ostree-ext/src/diff.rs similarity index 100% rename from ostree-ext/src/diff.rs rename to crates/ostree-ext/src/diff.rs diff --git a/ostree-ext/src/docgen.rs b/crates/ostree-ext/src/docgen.rs similarity index 100% rename from ostree-ext/src/docgen.rs rename to crates/ostree-ext/src/docgen.rs diff --git a/ostree-ext/src/fixture.rs b/crates/ostree-ext/src/fixture.rs similarity index 100% rename from ostree-ext/src/fixture.rs rename to crates/ostree-ext/src/fixture.rs diff --git a/ostree-ext/src/fixtures/fedora-coreos-contentmeta.json.gz b/crates/ostree-ext/src/fixtures/fedora-coreos-contentmeta.json.gz similarity index 100% rename from ostree-ext/src/fixtures/fedora-coreos-contentmeta.json.gz rename to crates/ostree-ext/src/fixtures/fedora-coreos-contentmeta.json.gz diff --git a/ostree-ext/src/fixtures/ostree-gpg-test-home.tar.gz b/crates/ostree-ext/src/fixtures/ostree-gpg-test-home.tar.gz similarity index 100% rename from ostree-ext/src/fixtures/ostree-gpg-test-home.tar.gz rename to crates/ostree-ext/src/fixtures/ostree-gpg-test-home.tar.gz diff --git a/ostree-ext/src/fsverity.rs b/crates/ostree-ext/src/fsverity.rs similarity index 100% rename from ostree-ext/src/fsverity.rs rename to crates/ostree-ext/src/fsverity.rs diff --git a/ostree-ext/src/globals.rs b/crates/ostree-ext/src/globals.rs similarity index 100% rename from ostree-ext/src/globals.rs rename to crates/ostree-ext/src/globals.rs diff --git a/ostree-ext/src/ima.rs b/crates/ostree-ext/src/ima.rs similarity index 100% rename from ostree-ext/src/ima.rs rename to crates/ostree-ext/src/ima.rs diff --git a/ostree-ext/src/integrationtest.rs b/crates/ostree-ext/src/integrationtest.rs similarity index 100% rename from ostree-ext/src/integrationtest.rs rename to crates/ostree-ext/src/integrationtest.rs diff --git a/ostree-ext/src/isolation.rs b/crates/ostree-ext/src/isolation.rs similarity index 100% rename from ostree-ext/src/isolation.rs rename to crates/ostree-ext/src/isolation.rs diff --git a/ostree-ext/src/keyfileext.rs b/crates/ostree-ext/src/keyfileext.rs similarity index 100% rename from ostree-ext/src/keyfileext.rs rename to crates/ostree-ext/src/keyfileext.rs diff --git a/ostree-ext/src/lib.rs b/crates/ostree-ext/src/lib.rs similarity index 100% rename from ostree-ext/src/lib.rs rename to crates/ostree-ext/src/lib.rs diff --git a/ostree-ext/src/logging.rs b/crates/ostree-ext/src/logging.rs similarity index 100% rename from ostree-ext/src/logging.rs rename to crates/ostree-ext/src/logging.rs diff --git a/ostree-ext/src/objectsource.rs b/crates/ostree-ext/src/objectsource.rs similarity index 100% rename from ostree-ext/src/objectsource.rs rename to crates/ostree-ext/src/objectsource.rs diff --git a/ostree-ext/src/objgv.rs b/crates/ostree-ext/src/objgv.rs similarity index 100% rename from ostree-ext/src/objgv.rs rename to crates/ostree-ext/src/objgv.rs diff --git a/ostree-ext/src/ostree_manual.rs b/crates/ostree-ext/src/ostree_manual.rs similarity index 100% rename from ostree-ext/src/ostree_manual.rs rename to crates/ostree-ext/src/ostree_manual.rs diff --git a/ostree-ext/src/ostree_prepareroot.rs b/crates/ostree-ext/src/ostree_prepareroot.rs similarity index 100% rename from ostree-ext/src/ostree_prepareroot.rs rename to crates/ostree-ext/src/ostree_prepareroot.rs diff --git a/ostree-ext/src/refescape.rs b/crates/ostree-ext/src/refescape.rs similarity index 100% rename from ostree-ext/src/refescape.rs rename to crates/ostree-ext/src/refescape.rs diff --git a/ostree-ext/src/repair.rs b/crates/ostree-ext/src/repair.rs similarity index 100% rename from ostree-ext/src/repair.rs rename to crates/ostree-ext/src/repair.rs diff --git a/ostree-ext/src/selinux.rs b/crates/ostree-ext/src/selinux.rs similarity index 100% rename from ostree-ext/src/selinux.rs rename to crates/ostree-ext/src/selinux.rs diff --git a/ostree-ext/src/statistics.rs b/crates/ostree-ext/src/statistics.rs similarity index 100% rename from ostree-ext/src/statistics.rs rename to crates/ostree-ext/src/statistics.rs diff --git a/ostree-ext/src/sysroot.rs b/crates/ostree-ext/src/sysroot.rs similarity index 100% rename from ostree-ext/src/sysroot.rs rename to crates/ostree-ext/src/sysroot.rs diff --git a/ostree-ext/src/tar/export.rs b/crates/ostree-ext/src/tar/export.rs similarity index 100% rename from ostree-ext/src/tar/export.rs rename to crates/ostree-ext/src/tar/export.rs diff --git a/ostree-ext/src/tar/import.rs b/crates/ostree-ext/src/tar/import.rs similarity index 100% rename from ostree-ext/src/tar/import.rs rename to crates/ostree-ext/src/tar/import.rs diff --git a/ostree-ext/src/tar/mod.rs b/crates/ostree-ext/src/tar/mod.rs similarity index 100% rename from ostree-ext/src/tar/mod.rs rename to crates/ostree-ext/src/tar/mod.rs diff --git a/ostree-ext/src/tar/write.rs b/crates/ostree-ext/src/tar/write.rs similarity index 100% rename from ostree-ext/src/tar/write.rs rename to crates/ostree-ext/src/tar/write.rs diff --git a/ostree-ext/src/tokio_util.rs b/crates/ostree-ext/src/tokio_util.rs similarity index 100% rename from ostree-ext/src/tokio_util.rs rename to crates/ostree-ext/src/tokio_util.rs diff --git a/ostree-ext/src/utils.rs b/crates/ostree-ext/src/utils.rs similarity index 100% rename from ostree-ext/src/utils.rs rename to crates/ostree-ext/src/utils.rs diff --git a/ostree-ext/tests/it/fixtures/hlinks.tar.gz b/crates/ostree-ext/tests/it/fixtures/hlinks.tar.gz similarity index 100% rename from ostree-ext/tests/it/fixtures/hlinks.tar.gz rename to crates/ostree-ext/tests/it/fixtures/hlinks.tar.gz diff --git a/ostree-ext/tests/it/fixtures/manifest1.json b/crates/ostree-ext/tests/it/fixtures/manifest1.json similarity index 100% rename from ostree-ext/tests/it/fixtures/manifest1.json rename to crates/ostree-ext/tests/it/fixtures/manifest1.json diff --git a/ostree-ext/tests/it/fixtures/manifest2.json b/crates/ostree-ext/tests/it/fixtures/manifest2.json similarity index 100% rename from ostree-ext/tests/it/fixtures/manifest2.json rename to crates/ostree-ext/tests/it/fixtures/manifest2.json diff --git a/ostree-ext/tests/it/main.rs b/crates/ostree-ext/tests/it/main.rs similarity index 100% rename from ostree-ext/tests/it/main.rs rename to crates/ostree-ext/tests/it/main.rs diff --git a/system-reinstall-bootc/Cargo.toml b/crates/system-reinstall-bootc/Cargo.toml similarity index 100% rename from system-reinstall-bootc/Cargo.toml rename to crates/system-reinstall-bootc/Cargo.toml diff --git a/system-reinstall-bootc/sample_config.yaml b/crates/system-reinstall-bootc/sample_config.yaml similarity index 100% rename from system-reinstall-bootc/sample_config.yaml rename to crates/system-reinstall-bootc/sample_config.yaml diff --git a/system-reinstall-bootc/src/btrfs.rs b/crates/system-reinstall-bootc/src/btrfs.rs similarity index 100% rename from system-reinstall-bootc/src/btrfs.rs rename to crates/system-reinstall-bootc/src/btrfs.rs diff --git a/system-reinstall-bootc/src/config/cli.rs b/crates/system-reinstall-bootc/src/config/cli.rs similarity index 100% rename from system-reinstall-bootc/src/config/cli.rs rename to crates/system-reinstall-bootc/src/config/cli.rs diff --git a/system-reinstall-bootc/src/config/mod.rs b/crates/system-reinstall-bootc/src/config/mod.rs similarity index 100% rename from system-reinstall-bootc/src/config/mod.rs rename to crates/system-reinstall-bootc/src/config/mod.rs diff --git a/system-reinstall-bootc/src/lvm.rs b/crates/system-reinstall-bootc/src/lvm.rs similarity index 100% rename from system-reinstall-bootc/src/lvm.rs rename to crates/system-reinstall-bootc/src/lvm.rs diff --git a/system-reinstall-bootc/src/main.rs b/crates/system-reinstall-bootc/src/main.rs similarity index 100% rename from system-reinstall-bootc/src/main.rs rename to crates/system-reinstall-bootc/src/main.rs diff --git a/system-reinstall-bootc/src/podman.rs b/crates/system-reinstall-bootc/src/podman.rs similarity index 100% rename from system-reinstall-bootc/src/podman.rs rename to crates/system-reinstall-bootc/src/podman.rs diff --git a/system-reinstall-bootc/src/prompt.rs b/crates/system-reinstall-bootc/src/prompt.rs similarity index 100% rename from system-reinstall-bootc/src/prompt.rs rename to crates/system-reinstall-bootc/src/prompt.rs diff --git a/system-reinstall-bootc/src/users.rs b/crates/system-reinstall-bootc/src/users.rs similarity index 100% rename from system-reinstall-bootc/src/users.rs rename to crates/system-reinstall-bootc/src/users.rs diff --git a/system-reinstall-bootc/tests/fixtures/loginctl.json b/crates/system-reinstall-bootc/tests/fixtures/loginctl.json similarity index 100% rename from system-reinstall-bootc/tests/fixtures/loginctl.json rename to crates/system-reinstall-bootc/tests/fixtures/loginctl.json diff --git a/sysusers/Cargo.toml b/crates/sysusers/Cargo.toml similarity index 100% rename from sysusers/Cargo.toml rename to crates/sysusers/Cargo.toml diff --git a/sysusers/src/lib.rs b/crates/sysusers/src/lib.rs similarity index 100% rename from sysusers/src/lib.rs rename to crates/sysusers/src/lib.rs diff --git a/sysusers/src/nameservice/group.rs b/crates/sysusers/src/nameservice/group.rs similarity index 100% rename from sysusers/src/nameservice/group.rs rename to crates/sysusers/src/nameservice/group.rs diff --git a/sysusers/src/nameservice/mod.rs b/crates/sysusers/src/nameservice/mod.rs similarity index 100% rename from sysusers/src/nameservice/mod.rs rename to crates/sysusers/src/nameservice/mod.rs diff --git a/sysusers/src/nameservice/passwd.rs b/crates/sysusers/src/nameservice/passwd.rs similarity index 100% rename from sysusers/src/nameservice/passwd.rs rename to crates/sysusers/src/nameservice/passwd.rs diff --git a/sysusers/src/nameservice/shadow.rs b/crates/sysusers/src/nameservice/shadow.rs similarity index 100% rename from sysusers/src/nameservice/shadow.rs rename to crates/sysusers/src/nameservice/shadow.rs diff --git a/tests-integration/Cargo.toml b/crates/tests-integration/Cargo.toml similarity index 100% rename from tests-integration/Cargo.toml rename to crates/tests-integration/Cargo.toml diff --git a/tests-integration/README.md b/crates/tests-integration/README.md similarity index 100% rename from tests-integration/README.md rename to crates/tests-integration/README.md diff --git a/tests-integration/src/container.rs b/crates/tests-integration/src/container.rs similarity index 100% rename from tests-integration/src/container.rs rename to crates/tests-integration/src/container.rs diff --git a/tests-integration/src/hostpriv.rs b/crates/tests-integration/src/hostpriv.rs similarity index 100% rename from tests-integration/src/hostpriv.rs rename to crates/tests-integration/src/hostpriv.rs diff --git a/tests-integration/src/install.rs b/crates/tests-integration/src/install.rs similarity index 100% rename from tests-integration/src/install.rs rename to crates/tests-integration/src/install.rs diff --git a/tests-integration/src/runvm.rs b/crates/tests-integration/src/runvm.rs similarity index 100% rename from tests-integration/src/runvm.rs rename to crates/tests-integration/src/runvm.rs diff --git a/tests-integration/src/selinux.rs b/crates/tests-integration/src/selinux.rs similarity index 100% rename from tests-integration/src/selinux.rs rename to crates/tests-integration/src/selinux.rs diff --git a/tests-integration/src/system_reinstall.rs b/crates/tests-integration/src/system_reinstall.rs similarity index 100% rename from tests-integration/src/system_reinstall.rs rename to crates/tests-integration/src/system_reinstall.rs diff --git a/tests-integration/src/tests-integration.rs b/crates/tests-integration/src/tests-integration.rs similarity index 100% rename from tests-integration/src/tests-integration.rs rename to crates/tests-integration/src/tests-integration.rs diff --git a/tmpfiles/Cargo.toml b/crates/tmpfiles/Cargo.toml similarity index 100% rename from tmpfiles/Cargo.toml rename to crates/tmpfiles/Cargo.toml diff --git a/tmpfiles/src/lib.rs b/crates/tmpfiles/src/lib.rs similarity index 100% rename from tmpfiles/src/lib.rs rename to crates/tmpfiles/src/lib.rs diff --git a/utils/Cargo.toml b/crates/utils/Cargo.toml similarity index 100% rename from utils/Cargo.toml rename to crates/utils/Cargo.toml diff --git a/utils/src/command.rs b/crates/utils/src/command.rs similarity index 100% rename from utils/src/command.rs rename to crates/utils/src/command.rs diff --git a/utils/src/iterators.rs b/crates/utils/src/iterators.rs similarity index 100% rename from utils/src/iterators.rs rename to crates/utils/src/iterators.rs diff --git a/utils/src/lib.rs b/crates/utils/src/lib.rs similarity index 100% rename from utils/src/lib.rs rename to crates/utils/src/lib.rs diff --git a/utils/src/path.rs b/crates/utils/src/path.rs similarity index 100% rename from utils/src/path.rs rename to crates/utils/src/path.rs diff --git a/utils/src/timestamp.rs b/crates/utils/src/timestamp.rs similarity index 100% rename from utils/src/timestamp.rs rename to crates/utils/src/timestamp.rs diff --git a/utils/src/tracing_util.rs b/crates/utils/src/tracing_util.rs similarity index 100% rename from utils/src/tracing_util.rs rename to crates/utils/src/tracing_util.rs diff --git a/xtask/Cargo.toml b/crates/xtask/Cargo.toml similarity index 100% rename from xtask/Cargo.toml rename to crates/xtask/Cargo.toml diff --git a/xtask/src/xtask.rs b/crates/xtask/src/xtask.rs similarity index 100% rename from xtask/src/xtask.rs rename to crates/xtask/src/xtask.rs