From 0e024933e0a831e04524fe318efddfac93f141f4 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sun, 18 Mar 2018 19:32:22 -0400
Subject: [PATCH] add recipe for realms tool

---
 .../citadel-tools/citadel-realms_0.1.0.bb     | 52 +++++++++++++++++++
 .../citadel-tools/citadel-rootfs.bb           |  2 +
 .../citadel-tools/citadel-tools.inc           |  2 +-
 .../packagegroup-citadel-desktop.bb           |  7 ++-
 4 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 meta-citadel/recipes-core/citadel-tools/citadel-realms_0.1.0.bb

diff --git a/meta-citadel/recipes-core/citadel-tools/citadel-realms_0.1.0.bb b/meta-citadel/recipes-core/citadel-tools/citadel-realms_0.1.0.bb
new file mode 100644
index 0000000..2519c71
--- /dev/null
+++ b/meta-citadel/recipes-core/citadel-tools/citadel-realms_0.1.0.bb
@@ -0,0 +1,52 @@
+SUMMARY = "citadel-realms"
+
+SRC_URI += " \
+crate://crates.io/ansi_term/0.11.0 \
+crate://crates.io/atty/0.2.8 \
+crate://crates.io/backtrace-sys/0.1.16 \
+crate://crates.io/backtrace/0.3.5 \
+crate://crates.io/bitflags/1.0.1 \
+crate://crates.io/cc/1.0.6 \
+crate://crates.io/cfg-if/0.1.2 \
+crate://crates.io/clap/2.31.1 \
+crate://crates.io/failure/0.1.1 \
+crate://crates.io/failure_derive/0.1.1 \
+crate://crates.io/libc/0.2.39 \
+crate://crates.io/proc-macro2/0.2.3 \
+crate://crates.io/quote/0.3.15 \
+crate://crates.io/quote/0.4.2 \
+crate://crates.io/redox_syscall/0.1.37 \
+crate://crates.io/redox_termios/0.1.1 \
+crate://crates.io/rustc-demangle/0.1.7 \
+crate://crates.io/same-file/1.0.2 \
+crate://crates.io/serde/1.0.30 \
+crate://crates.io/serde_derive/1.0.30 \
+crate://crates.io/serde_derive_internals/0.20.0 \
+crate://crates.io/strsim/0.7.0 \
+crate://crates.io/syn/0.11.11 \
+crate://crates.io/syn/0.12.14 \
+crate://crates.io/synom/0.11.3 \
+crate://crates.io/synstructure/0.6.1 \
+crate://crates.io/termion/1.5.1 \
+crate://crates.io/termcolor/0.3.5 \
+crate://crates.io/textwrap/0.9.0 \
+crate://crates.io/toml/0.4.5 \
+crate://crates.io/unicode-width/0.1.4 \
+crate://crates.io/unicode-xid/0.0.4 \
+crate://crates.io/unicode-xid/0.1.0 \
+crate://crates.io/vec_map/0.8.0 \
+crate://crates.io/walkdir/2.1.4 \
+crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi/0.3.4 \
+crate://crates.io/wincolor/0.1.6 \
+"
+
+inherit cargo
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 -T ${B}/target/${CARGO_TARGET_SUBDIR}/citadel-realms ${D}${bindir}/realms
+}
+
+require citadel-tools.inc
diff --git a/meta-citadel/recipes-core/citadel-tools/citadel-rootfs.bb b/meta-citadel/recipes-core/citadel-tools/citadel-rootfs.bb
index 56fae68..9bc902f 100644
--- a/meta-citadel/recipes-core/citadel-tools/citadel-rootfs.bb
+++ b/meta-citadel/recipes-core/citadel-tools/citadel-rootfs.bb
@@ -72,5 +72,7 @@ do_install() {
     install -m 644 ${B}/conf/citadel-rootfs.conf ${D}${datadir}/citadel
 }
 
+FILES_${PN} += "${datadir}/citadel"
+
 inherit cargo
 require citadel-tools.inc
diff --git a/meta-citadel/recipes-core/citadel-tools/citadel-tools.inc b/meta-citadel/recipes-core/citadel-tools/citadel-tools.inc
index e3ead11..de49e81 100644
--- a/meta-citadel/recipes-core/citadel-tools/citadel-tools.inc
+++ b/meta-citadel/recipes-core/citadel-tools/citadel-tools.inc
@@ -12,5 +12,5 @@ do_unpack_src() {
     rm -rf ${WORKDIR}$/${PN}/target
 }
 # don't use cached task
-#do_unpack_src[nostamp] = "1"
+# do_unpack_src[nostamp] = "1"
 addtask unpack_src after do_unpack before do_patch
diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb
index f9923b8..57f9104 100644
--- a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb
+++ b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb
@@ -25,6 +25,7 @@ RDEPENDS_${PN} = "\
     gnome-backgrounds \
     gnome-tweak-tool \
     gnome-terminal \
+    gnome-usage \
     libgnome-desktop \
     libxkbcommon \
     xkeyboard-config \
@@ -64,9 +65,7 @@ RDEPENDS_${PN} = "\
     paper-icon-theme \
     ttf-roboto \
     citadel-desktop-gsettings \
-    nautilus \
     systemd-analyze \
-    debootstrap \
     wget \
     sed \
     binutils \
@@ -77,10 +76,10 @@ RDEPENDS_${PN} = "\
     dosfstools \
     btrfs-tools \
     dash-to-panel \
-    launch-default-appimg \
+    launch-default-realm \
     citadel-desktopd \
     citadel-rootfs \
-    citadel-appimg \
+    citadel-realms \
     iproute2 \
     util-linux-hwclock \
     sgmenu \