From ad2135ca5b42ce465994c90a5d22b2e37059a26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 8 Oct 2018 13:48:12 +0200
Subject: [PATCH] recipes-image: replace packagegroup-gnome-xserver-base by
 x11-base.inc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just including common packages makes overrides / customization a lot easier.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-image/allgui/allgui-base-image.bb     |  8 +++---
 recipes-image/include/x11-base.inc            | 17 +++++++++++++
 recipes-image/kde/kde-base-image.bb           |  5 ++--
 recipes-image/lxqt/lxqt-base-image.bb         |  7 +++---
 .../packagegroup-gnome-xserver-base.bb        | 25 -------------------
 .../packagegroups/packagegroup-image-base.bb  |  2 --
 recipes-image/xfce4/xfce4-base-image.bb       |  7 +++---
 7 files changed, 30 insertions(+), 41 deletions(-)
 create mode 100644 recipes-image/include/x11-base.inc
 delete mode 100644 recipes-image/packagegroups/packagegroup-gnome-xserver-base.bb

diff --git a/recipes-image/allgui/allgui-base-image.bb b/recipes-image/allgui/allgui-base-image.bb
index e6f53f4..e5838e6 100644
--- a/recipes-image/allgui/allgui-base-image.bb
+++ b/recipes-image/allgui/allgui-base-image.bb
@@ -1,11 +1,11 @@
-require ../console/console-net-image.bb
+require recipes-image/console/console-net-image.bb
+require recipes-image/include/x11-base.inc
 
 export IMAGE_BASENAME = "allgui-base-image"
 
-# currently: plasma / xfce / lxqt
-# not included: gnome / efl
+# currently: plasma / xfce / lxqt / weston
 IMAGE_INSTALL += " \
-    packagegroup-core-x11-xserver \
+    ${X11_BASE_INSTALL} \
     packagegroup-image-base \
     \
     sddm \
diff --git a/recipes-image/include/x11-base.inc b/recipes-image/include/x11-base.inc
new file mode 100644
index 0000000..4db5e53
--- /dev/null
+++ b/recipes-image/include/x11-base.inc
@@ -0,0 +1,17 @@
+X11_BASE_INSTALL += " \
+    ${DISTRO_GUI_USER} \
+    packagegroup-core-x11-xserver \
+    \
+    dbus-x11 \
+    iso-codes \
+    mime-support \
+    xauth \
+    xdg-utils \
+    xhost \
+    xinetd \
+    xinit \
+    xrandr \
+    xrdb \
+    xset \
+    xvinfo \
+"
diff --git a/recipes-image/kde/kde-base-image.bb b/recipes-image/kde/kde-base-image.bb
index 74e7524..a31816b 100644
--- a/recipes-image/kde/kde-base-image.bb
+++ b/recipes-image/kde/kde-base-image.bb
@@ -1,9 +1,10 @@
-require ../console/console-net-image.bb
+require recipes-image/console/console-net-image.bb
+require recipes-image/include/x11-base.inc
 
 export IMAGE_BASENAME = "kde-base-image"
 
 IMAGE_INSTALL += " \
-    packagegroup-core-x11-xserver \
+    ${X11_BASE_INSTALL} \
     packagegroup-image-base \
     \
     sddm \
diff --git a/recipes-image/lxqt/lxqt-base-image.bb b/recipes-image/lxqt/lxqt-base-image.bb
index d5b64d8..d73af00 100644
--- a/recipes-image/lxqt/lxqt-base-image.bb
+++ b/recipes-image/lxqt/lxqt-base-image.bb
@@ -1,12 +1,12 @@
-require ../console/console-net-image.bb
+require recipes-image/console/console-net-image.bb
+require recipes-image/include/x11-base.inc
 
 export IMAGE_BASENAME = "lxqt-base-image"
 
 LXQT_DM ?= "lxdm"
 
 IMAGE_INSTALL += " \
-    packagegroup-gnome-xserver-base \
-    packagegroup-core-x11-xserver \
+    ${X11_BASE_INSTALL} \
     ${LXQT_DM} \
     \
     packagegroup-lxqt-base \
@@ -15,6 +15,5 @@ IMAGE_INSTALL += " \
     lxqt-default-config \
 "
 
-
 # reenable graphical target
 IMAGE_FEATURES += "x11-base"
diff --git a/recipes-image/packagegroups/packagegroup-gnome-xserver-base.bb b/recipes-image/packagegroups/packagegroup-gnome-xserver-base.bb
deleted file mode 100644
index 9d5622c..0000000
--- a/recipes-image/packagegroups/packagegroup-gnome-xserver-base.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Task for a full GNOME based image"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-PR = "r13"
-
-inherit packagegroup
-
-# for backwards compatibility
-RPROVIDES_${PN} += "packagegroup-gnome3-xserver-base"
-
-RDEPENDS_${PN} = " \
-  dbus-x11 \
-  iso-codes \
-  mime-support \
-  xauth \
-  xdg-utils \
-  xhost \
-  xinetd \
-  xinit \
-  xrandr \
-  xrdb \
-  xset \
-  xvinfo \
-"
diff --git a/recipes-image/packagegroups/packagegroup-image-base.bb b/recipes-image/packagegroups/packagegroup-image-base.bb
index 415cf66..b2d7f03 100644
--- a/recipes-image/packagegroups/packagegroup-image-base.bb
+++ b/recipes-image/packagegroups/packagegroup-image-base.bb
@@ -12,8 +12,6 @@ RDEPENDS_${PN} = " \
     source-han-sans-jp-fonts \
     source-han-sans-tw-fonts \
     \
-    ${DISTRO_GUI_USER} \
-    \
     gedit gtksourceview-classic-light \
     xarchiver \
     shared-mime-info \
diff --git a/recipes-image/xfce4/xfce4-base-image.bb b/recipes-image/xfce4/xfce4-base-image.bb
index d004395..fb09bcb 100644
--- a/recipes-image/xfce4/xfce4-base-image.bb
+++ b/recipes-image/xfce4/xfce4-base-image.bb
@@ -1,14 +1,14 @@
-require ../console/console-net-image.bb
+require recipes-image/console/console-net-image.bb
+require recipes-image/include/x11-base.inc
 
 export IMAGE_BASENAME = "xfce4-base-image"
 
 XFCE_DM ?= "lxdm"
 
 IMAGE_INSTALL += " \
-    packagegroup-core-x11-xserver \
+    ${X11_BASE_INSTALL} \
     ${XFCE_DM} \
     \
-    packagegroup-gnome-xserver-base \
     packagegroup-xfce-base \
     packagegroup-image-base \
     \
@@ -17,6 +17,5 @@ IMAGE_INSTALL += " \
     xfce4-whiskermenu-plugin \
 "
 
-
 # reenable graphical target
 IMAGE_FEATURES += "x11-base"