diff --git a/citadel-tools/citadel-rootfs/.gitignore b/citadel-tools/citadel-update/.gitignore similarity index 100% rename from citadel-tools/citadel-rootfs/.gitignore rename to citadel-tools/citadel-update/.gitignore diff --git a/citadel-tools/citadel-rootfs/Cargo.lock b/citadel-tools/citadel-update/Cargo.lock similarity index 100% rename from citadel-tools/citadel-rootfs/Cargo.lock rename to citadel-tools/citadel-update/Cargo.lock diff --git a/citadel-tools/citadel-rootfs/Cargo.toml b/citadel-tools/citadel-update/Cargo.toml similarity index 93% rename from citadel-tools/citadel-rootfs/Cargo.toml rename to citadel-tools/citadel-update/Cargo.toml index 437bc46..3ecf077 100644 --- a/citadel-tools/citadel-rootfs/Cargo.toml +++ b/citadel-tools/citadel-update/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "citadel-rootfs" +name = "citadel-update" version = "0.1.0" authors = ["Bruce Leidl "] homepage = "https://github.com/subgraph/citadel" diff --git a/citadel-tools/citadel-rootfs/conf/citadel-rootfs.conf b/citadel-tools/citadel-update/conf/citadel-update.conf similarity index 100% rename from citadel-tools/citadel-rootfs/conf/citadel-rootfs.conf rename to citadel-tools/citadel-update/conf/citadel-update.conf diff --git a/citadel-tools/citadel-rootfs/src/blockdev.rs b/citadel-tools/citadel-update/src/blockdev.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/blockdev.rs rename to citadel-tools/citadel-update/src/blockdev.rs diff --git a/citadel-tools/citadel-rootfs/src/boot.rs b/citadel-tools/citadel-update/src/boot.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/boot.rs rename to citadel-tools/citadel-update/src/boot.rs diff --git a/citadel-tools/citadel-rootfs/src/config.rs b/citadel-tools/citadel-update/src/config.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/config.rs rename to citadel-tools/citadel-update/src/config.rs diff --git a/citadel-tools/citadel-rootfs/src/main.rs b/citadel-tools/citadel-update/src/main.rs similarity index 98% rename from citadel-tools/citadel-rootfs/src/main.rs rename to citadel-tools/citadel-update/src/main.rs index 1f9af7d..a30db23 100644 --- a/citadel-tools/citadel-rootfs/src/main.rs +++ b/citadel-tools/citadel-update/src/main.rs @@ -83,8 +83,8 @@ fn main() { _ => {}, }; - let mut app = App::new("citadel-rootfs") - .about("Subgraph Citadel rootfs partition management") + let mut app = App::new("citadel-update") + .about("Subgraph Citadel update and rootfs management") .settings(&[ArgRequiredElseHelp, ColoredHelp, DisableHelpSubcommand, DisableVersion, DeriveDisplayOrder]) .arg(Arg::with_name("v") .help("Verbose output") diff --git a/citadel-tools/citadel-rootfs/src/metainfo.rs b/citadel-tools/citadel-update/src/metainfo.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/metainfo.rs rename to citadel-tools/citadel-update/src/metainfo.rs diff --git a/citadel-tools/citadel-rootfs/src/packer.rs b/citadel-tools/citadel-update/src/packer.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/packer.rs rename to citadel-tools/citadel-update/src/packer.rs diff --git a/citadel-tools/citadel-rootfs/src/partition.rs b/citadel-tools/citadel-update/src/partition.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/partition.rs rename to citadel-tools/citadel-update/src/partition.rs diff --git a/citadel-tools/citadel-rootfs/src/unpacker.rs b/citadel-tools/citadel-update/src/unpacker.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/unpacker.rs rename to citadel-tools/citadel-update/src/unpacker.rs diff --git a/citadel-tools/citadel-rootfs/src/util.rs b/citadel-tools/citadel-update/src/util.rs similarity index 100% rename from citadel-tools/citadel-rootfs/src/util.rs rename to citadel-tools/citadel-update/src/util.rs diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb index 551b5cd..0992254 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb @@ -7,6 +7,6 @@ RDEPENDS_${PN} = "\ packagegroup-gnome \ packagegroup-sway \ packagegroup-theme \ - citadel-rootfs \ + citadel-update \ citadel-realms \ " diff --git a/meta-citadel/recipes-core/citadel-tools/citadel-rootfs.bb b/meta-citadel/recipes-core/citadel-tools/citadel-update.bb similarity index 93% rename from meta-citadel/recipes-core/citadel-tools/citadel-rootfs.bb rename to meta-citadel/recipes-core/citadel-tools/citadel-update.bb index d820316..12a4f6b 100644 --- a/meta-citadel/recipes-core/citadel-tools/citadel-rootfs.bb +++ b/meta-citadel/recipes-core/citadel-tools/citadel-update.bb @@ -1,4 +1,4 @@ -SUMMARY = "citadel-rootfs" +SUMMARY = "citadel-update" SRC_URI = "\ crate://crates.io/ansi_term/0.10.2 \ @@ -70,8 +70,8 @@ do_install() { install -d ${D}${bindir} install -d ${D}${datadir}/citadel - install -m 755 ${B}/target/${CARGO_TARGET_SUBDIR}/citadel-rootfs ${D}${bindir} - install -m 644 ${B}/conf/citadel-rootfs.conf ${D}${datadir}/citadel + install -m 755 ${B}/target/${CARGO_TARGET_SUBDIR}/citadel-update ${D}${bindir} + install -m 644 ${B}/conf/citadel-update.conf ${D}${datadir}/citadel } FILES_${PN} += "${datadir}/citadel"