From a7329e1e3d2777082c68ad1a8730cf5a91e39e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 5 Nov 2018 18:04:56 +0100 Subject: [PATCH] xfce4-default-config: Add RDEPENDS to themes an minimal xfce4-panel entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/layer.conf | 5 +++++ .../guiconfig/xfce4-default-config_1.0.bb | 9 +++++++++ recipes-image/allgui/allgui-base-image.bb | 1 - recipes-image/allgui/allgui-tiny-image.bb | 1 - recipes-image/xfce4/xfce4-base-image.bb | 1 - recipes-image/xfce4/xfce4-tiny-image.bb | 1 - 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 8a2c314..d0f09d3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -30,3 +30,8 @@ BBFILES_DYNAMIC += " \ \ core:${LAYERDIR}/appends/oe-core/*.bbappend \ " + +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + xfce4-default-config->gnome-theme-adwaita-dark \ + xfce4-default-config->xfce4-whiskermenu-plugin \ +" diff --git a/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb b/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb index f452f29..e192db3 100644 --- a/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb +++ b/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb @@ -25,3 +25,12 @@ do_install() { } FILES_${PN} += "${datadir}/backgrounds" + +RDEPENDS_${PN} += " \ + adwaita-icon-theme-cursors \ + adwaita-icon-theme-symbolic \ + adwaita-icon-theme-symbolic-hires \ + \ + gnome-theme-adwaita-dark \ + xfce4-whiskermenu-plugin \ +" diff --git a/recipes-image/allgui/allgui-base-image.bb b/recipes-image/allgui/allgui-base-image.bb index 6e22e38..23623f1 100644 --- a/recipes-image/allgui/allgui-base-image.bb +++ b/recipes-image/allgui/allgui-base-image.bb @@ -16,7 +16,6 @@ IMAGE_INSTALL += " \ packagegroup-xfce-base \ network-manager-applet \ xfce4-default-config \ - xfce4-whiskermenu-plugin \ \ packagegroup-lxqt-base \ lxqt-default-config \ diff --git a/recipes-image/allgui/allgui-tiny-image.bb b/recipes-image/allgui/allgui-tiny-image.bb index 74f9ee2..04de40d 100644 --- a/recipes-image/allgui/allgui-tiny-image.bb +++ b/recipes-image/allgui/allgui-tiny-image.bb @@ -9,7 +9,6 @@ IMAGE_INSTALL += " \ packagegroup-xfce-extended \ packagegroup-xfce-multimedia \ rodent-icon-theme \ - gnome-theme-adwaita-dark \ adwaita-qt \ \ packagegroup-kde-apps-tiny \ diff --git a/recipes-image/xfce4/xfce4-base-image.bb b/recipes-image/xfce4/xfce4-base-image.bb index fb10290..0d6b734 100644 --- a/recipes-image/xfce4/xfce4-base-image.bb +++ b/recipes-image/xfce4/xfce4-base-image.bb @@ -14,7 +14,6 @@ IMAGE_INSTALL += " \ \ network-manager-applet \ xfce4-default-config \ - xfce4-whiskermenu-plugin \ " # reenable graphical target diff --git a/recipes-image/xfce4/xfce4-tiny-image.bb b/recipes-image/xfce4/xfce4-tiny-image.bb index fc4b40f..35d25d6 100644 --- a/recipes-image/xfce4/xfce4-tiny-image.bb +++ b/recipes-image/xfce4/xfce4-tiny-image.bb @@ -6,7 +6,6 @@ IMAGE_INSTALL += " \ packagegroup-xfce-extended \ packagegroup-xfce-multimedia \ rodent-icon-theme \ - gnome-theme-adwaita-dark \ \ packagegroup-gui-tiny \ "