From f9308dd6ee6eaadaf64a4b9dfcec2d87800db8cd Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 2 Apr 2019 15:47:38 -0400
Subject: [PATCH] a few new packages added

---
 .../packagegroups/packagegroup-citadel-base.bb                | 3 +++
 .../recipes-citadel/packagegroups/packagegroup-citadel.bb     | 4 +---
 .../recipes-citadel/packagegroups/packagegroup-desktop.bb     | 3 ++-
 .../recipes-citadel/packagegroups/packagegroup-gnome.bb       | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb
index eb97502..3e6c69e 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel-base.bb
@@ -14,6 +14,7 @@ BASH_COMPLETION = "\
 "
 
 RDEPENDS_${PN} = "\
+    keyutils \
     citadel-config \
     base-files \
     base-passwd \
@@ -22,6 +23,7 @@ RDEPENDS_${PN} = "\
     syslinux-extlinux \
     keymaps \
     kbd \
+    nnn \
     console-tools \
     coreutils \
     gzip \
@@ -65,6 +67,7 @@ RDEPENDS_${PN} = "\
     openssh-ssh \
     cryptsetup \
     e2fsprogs \
+    e2fsprogs-resize2fs \
     dosfstools \
     libpam \
     wireguard-tools \
diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb
index 536bb18..92a054b 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb
@@ -7,8 +7,6 @@ RDEPENDS_${PN} = "\
     packagegroup-gnome \
     packagegroup-sway \
     packagegroup-theme \
-    citadel-tools-mount \
-    citadel-tools-install \
+    citadel-tools \
     citadel-tools-realms \
-    citadel-tools-image \
 "
diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb
index 4046507..eaedef4 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb
@@ -10,7 +10,6 @@ CITADEL_POWERTOP_append_citadel-powertop= "powertop"
 
 RDEPENDS_${PN} = "\
     ${CITADEL_POWERTOP} \
-    citadel-tools-desktopd \
     accountsservice \
     upower \
     colord \
@@ -33,6 +32,7 @@ RDEPENDS_${PN} = "\
     gtk+3 \
     libnotify \
     ttf-bitstream-vera \
+    ttf-dejavu-sans-mono \
     startup-notification \
     gconf \
     gcr \
@@ -44,4 +44,5 @@ RDEPENDS_${PN} = "\
     librsvg \
     librsvg-gtk \
     glib-2.0-utils \
+    xdg-dbus-proxy \
 "
diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
index 02bf7a5..d8e169a 100644
--- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
+++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
@@ -11,7 +11,6 @@ RDEPENDS_${PN} = "\
     gnome-control-center \
     gnome-screenshot \
     gnome-settings-daemon \
-    gnome-tweaks \
     gnome-terminal \
     gnome-usage \
     libgnome-desktop \