From 8884b2803aecc5efdcc47d786f9bceadd4d34442 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Mon, 26 Mar 2018 22:52:49 -0400 Subject: [PATCH] organized packagegroups into modules --- .../recipes-core/images/citadel-image.bb | 2 +- .../packagegroup-citadel-base.bb | 20 ++++ .../packagegroup-citadel-desktop.bb | 98 ------------------- .../packagegroups/packagegroup-citadel.bb | 13 +++ .../packagegroups/packagegroup-desktop.bb | 43 ++++++++ .../packagegroups/packagegroup-gnome.bb | 34 +++++++ .../packagegroups/packagegroup-sway.bb | 11 +++ .../packagegroups/packagegroup-theme.bb | 8 ++ 8 files changed, 130 insertions(+), 99 deletions(-) delete mode 100644 meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb create mode 100644 meta-citadel/recipes-core/packagegroups/packagegroup-citadel.bb create mode 100644 meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb create mode 100644 meta-citadel/recipes-core/packagegroups/packagegroup-gnome.bb create mode 100644 meta-citadel/recipes-core/packagegroups/packagegroup-sway.bb create mode 100644 meta-citadel/recipes-core/packagegroups/packagegroup-theme.bb diff --git a/meta-citadel/recipes-core/images/citadel-image.bb b/meta-citadel/recipes-core/images/citadel-image.bb index dac6b83..67afaa2 100644 --- a/meta-citadel/recipes-core/images/citadel-image.bb +++ b/meta-citadel/recipes-core/images/citadel-image.bb @@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += "set_citadel_user_password; symlink_lib64; setup_v IMAGE_FSTYPES = "ext2" IMAGE_INSTALL += "\ - packagegroup-citadel-desktop \ + packagegroup-citadel \ " set_blank_user_password() { diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb index f1a7742..c54b059 100644 --- a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb +++ b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb @@ -39,4 +39,24 @@ RDEPENDS_${PN} = "\ tzdata-posix \ glibc-charmap-utf-8 \ lvm2 \ + findutils \ + lsof \ + strace \ + iproute2 \ + util-linux-hwclock \ + btrfs-tools \ + systemd-analyze \ + wget \ + sed \ + xz \ + openssh-ssh \ + cryptsetup \ + e2fsprogs \ + dosfstools \ + libpam \ + iproute2-bash-completion \ + glib-2.0-bash-completion \ + pulseaudio-bash-completion \ + systemd-bash-completion \ + util-linux-bash-completion \ " diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb deleted file mode 100644 index 02488ab..0000000 --- a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb +++ /dev/null @@ -1,98 +0,0 @@ - -inherit packagegroup - -CITADEL_POWERTOP = "" -# append only if citadel-powertop override is set -CITADEL_POWERTOP_append_citadel-powertop= "powertop" - -RDEPENDS_${PN} = "\ - atk \ - at-spi2-atk \ - sound-theme-freedesktop \ - adwaita-icon-theme \ - adwaita-icon-theme-hires \ - adwaita-icon-theme-symbolic \ - adwaita-icon-theme-symbolic-hires \ - adwaita-icon-theme-cursors \ - hicolor-icon-theme \ - iso-codes \ - libgudev \ - caribou \ - networkmanager \ - network-manager-applet \ - clutter-1.0 \ - gnome-desktop \ - gnome-bluetooth \ - gnome-control-center \ - gnome-settings-daemon \ - gnome-backgrounds \ - gnome-tweaks \ - gnome-terminal \ - gnome-usage \ - libgnome-desktop \ - libxkbcommon \ - xkeyboard-config \ - libusb1 \ - dbus-glib \ - gtk+3 \ - libnotify \ - libgweather \ - startup-notification \ - ttf-bitstream-vera \ - gconf \ - gcr \ - dconf \ - ibus \ - libsecret \ - libwacom \ - libcroco \ - librsvg \ - librsvg-gtk \ - zenity \ - accountsservice \ - upower \ - mutter \ - gjs \ - libpam \ - gnome-keyring \ - colord \ - colord-plugins \ - gnome-session \ - gnome-shell \ - nautilus \ - gdm \ - plymouth \ - shared-mime-info \ - pulseaudio-server \ - glib-2.0-utils \ - adapta-gtk-theme \ - paper-icon-theme \ - ttf-roboto \ - citadel-desktop-gsettings \ - systemd-analyze \ - wget \ - sed \ - xz \ - openssh-ssh \ - cryptsetup \ - e2fsprogs \ - dosfstools \ - btrfs-tools \ - dash-to-panel \ - launch-default-realm \ - citadel-desktopd \ - citadel-rootfs \ - citadel-realms \ - iproute2 \ - util-linux-hwclock \ - sgmenu \ - sgstatus \ - wlc \ - sway \ - xcb-util-xrm \ - rofi \ - findutils \ - lsof \ - strace \ - ${CITADEL_POWERTOP} \ -" diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-citadel.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel.bb new file mode 100644 index 0000000..bf0a965 --- /dev/null +++ b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel.bb @@ -0,0 +1,13 @@ + +inherit packagegroup + +RDEPENDS_${PN} = "\ + packagegroup-citadel-base \ + packagegroup-desktop \ + packagegroup-gnome \ + packagegroup-sway \ + packagegroup-theme \ + launch-default-realm \ + citadel-rootfs \ + citadel-realms \ +" diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb new file mode 100644 index 0000000..851d1c1 --- /dev/null +++ b/meta-citadel/recipes-core/packagegroups/packagegroup-desktop.bb @@ -0,0 +1,43 @@ + +inherit packagegroup + +CITADEL_POWERTOP = "" +# append only if citadel-powertop override is set +CITADEL_POWERTOP_append_citadel-powertop= "powertop" + +RDEPENDS_${PN} = "\ + ${CITADEL_POWERTOP} \ + citadel-desktopd \ + accountsservice \ + upower \ + colord \ + colord-plugins \ + gdm \ + plymouth \ + shared-mime-info \ + pulseaudio-server \ + sound-theme-freedesktop \ + iso-codes \ + libgudev \ + networkmanager \ + network-manager-applet \ + clutter-1.0 \ + libxkbcommon \ + xkeyboard-config \ + libusb1 \ + dbus-glib \ + gtk+3 \ + libnotify \ + ttf-bitstream-vera \ + startup-notification \ + gconf \ + gcr \ + dconf \ + ibus \ + libsecret \ + libwacom \ + libcroco \ + librsvg \ + librsvg-gtk \ + glib-2.0-utils \ +" diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-gnome.bb new file mode 100644 index 0000000..c58f076 --- /dev/null +++ b/meta-citadel/recipes-core/packagegroups/packagegroup-gnome.bb @@ -0,0 +1,34 @@ + +inherit packagegroup + +RDEPENDS_${PN} = "\ + atk \ + at-spi2-atk \ + libgweather \ + zenity \ + gnome-desktop \ + gnome-bluetooth \ + gnome-control-center \ + gnome-settings-daemon \ + gnome-backgrounds \ + gnome-tweaks \ + gnome-terminal \ + gnome-usage \ + libgnome-desktop \ + mutter \ + nautilus \ + gjs \ + caribou \ + gnome-keyring \ + citadel-desktop-gsettings \ + gnome-session \ + gnome-shell \ + adwaita-icon-theme \ + adwaita-icon-theme-hires \ + adwaita-icon-theme-symbolic \ + adwaita-icon-theme-symbolic-hires \ + adwaita-icon-theme-cursors \ + hicolor-icon-theme \ + dash-to-panel \ +" + diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-sway.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-sway.bb new file mode 100644 index 0000000..4d88b9c --- /dev/null +++ b/meta-citadel/recipes-core/packagegroups/packagegroup-sway.bb @@ -0,0 +1,11 @@ + +inherit packagegroup + +RDEPENDS_${PN} = "\ + sgmenu \ + sgstatus \ + wlc \ + sway \ + xcb-util-xrm \ + rofi \ +" diff --git a/meta-citadel/recipes-core/packagegroups/packagegroup-theme.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-theme.bb new file mode 100644 index 0000000..44db564 --- /dev/null +++ b/meta-citadel/recipes-core/packagegroups/packagegroup-theme.bb @@ -0,0 +1,8 @@ + +inherit packagegroup + +RDEPENDS_${PN} = "\ + adapta-gtk-theme \ + paper-icon-theme \ + ttf-roboto \ +"