recipes-image: replace packagegroup-gnome-xserver-base by x11-base.inc

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

@@ -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 \

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 \
+"

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 \

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"

recipes-image/packagegroups/packagegroup-gnome-xserver-base.bb

@@ -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 \
-"

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 \

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"