gplv3: Further fixed image without GPLv3 support

The standard image was missing the GPLv3 packages.
Added them back in and created a new distro without GPLv3.

conf/distro/guf-wayland-no-gplv3.conf

+# GUF Distro for Wayland.
+
+require conf/distro/include/guf-base.inc
+
+DISTRO = "guf-wayland-no-gplv3"
+DISTRO_NAME = "GUF Wayland (without GPLv3)"
+
+DISTRO_FEATURES_remove = "bluetooth bluez5 gobject-introspection-data pulseaudio directfb x11"
+DISTRO_FEATURES_BACKFILL_CONSIDERED += "bluetooth bluez5 gobject-introspection-data pulseaudio"
+
+# Add support for wayland
+DISTRO_FEATURES_append = " wayland"
+
+# Add opengl
+DISTRO_FEATURES_append = " opengl vulkan"
+
+# Default is busybox
+# Recommandation from poky/meta-poky/conf/local.conf.sample.extended
+# expect syslog which is replaced by syslog-ng
+PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils"
+VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
+VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
+VIRTUAL-RUNTIME_base-utils-syslog = "syslog-ng"
+VIRTUAL-RUNTIME_vim = "vim"
+

conf/distro/guf-wayland.conf

@@ -8,12 +8,14 @@ DISTRO_NAME = "GUF Wayland"
 DISTRO_FEATURES_remove = "bluetooth bluez5 gobject-introspection-data pulseaudio directfb x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "bluetooth bluez5 gobject-introspection-data pulseaudio"
 
-# add support for wayland
+# Add support for wayland
 DISTRO_FEATURES_append = " wayland"
 
-# add opengl
+# Add opengl
 DISTRO_FEATURES_append = " opengl vulkan"
 
+# Add support for GPLv3
+DISTRO_FEATURES_append = " gplv3"
 
 # Default is busybox
 # Recommandation from poky/meta-poky/conf/local.conf.sample.extended

recipes-bsp/packagegroups/packagegroup-guf-debug.bb

@@ -3,13 +3,13 @@ DESCRIPTION = "SECO Northern Europe debugging tools packagegroup"
 inherit packagegroup
 
 PACKAGES = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     ${PN} \
     ${PN}-ltp \
-    ${PN}-gplv3 \
 "
 
 RDEPENDS_${PN} = " \
-    ${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPL-3.0', '', '${PN}-gplv3', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     blktrace \
     bonnie++ \
     ddrescue \

recipes-bsp/packagegroups/packagegroup-guf-minimal.bb

@@ -3,12 +3,12 @@ DESCRIPTION = "SECO Northern Europe minimal image packagegroup"
 inherit packagegroup
 
 PACKAGES = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     ${PN} \
-    ${PN}-gplv3 \
 "
 
 RDEPENDS_${PN} = " \
-    ${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPL-3.0', '', '${PN}-gplv3', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     dtc \
     packagegroup-guf-networking-minimal \
     sharedconf \

recipes-bsp/packagegroups/packagegroup-guf-networking.bb

@@ -3,13 +3,13 @@ DESCRIPTION = "SECO Northern Europe network tools packagegroup"
 inherit packagegroup
 
 PACKAGES = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     ${PN} \
     ${PN}-minimal \
-    ${PN}-gplv3 \
 "
 
 RDEPENDS_${PN} = " \
-    ${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPL-3.0', '', '${PN}-gplv3', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     ${PN}-minimal \
     modemmanager \
     sharedconf-network \

recipes-bsp/packagegroups/packagegroup-guf-productiontests.bb

@@ -11,7 +11,7 @@ RDEPENDS_${PN} = " \
     alsa-utils-speakertest \
     bluez5 \
     gf-productiontests \
-    iw \
     iperf3 \
+    iw \
 "
 

recipes-bsp/packagegroups/packagegroup-guf-python.bb

@@ -8,7 +8,7 @@ PACKAGES = " \
 
 RDEPENDS_${PN} = " \
     python3 \
-    python3-pyserial \
     python3-pip \
+    python3-pyserial \
 "
 

recipes-bsp/packagegroups/packagegroup-guf-qt5.bb

@@ -3,15 +3,16 @@ DESCRIPTION = "SECO Northern Europe Qt5 packagegroup"
 inherit packagegroup
 
 PACKAGES = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     ${PN} \
+    ${PN}-examples \
     ${PN}-tests \
     ${PN}-tools \
-    ${PN}-examples \
     ${PN}-translations \
-    ${PN}-gplv3 \
 "
 
 RDEPENDS_${PN} = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     qt3d \
     qtbase \
     qtbase-fingerpaint \
@@ -45,18 +46,17 @@ RDEPENDS_${PN} = " \
     qtwebsockets \
     qtxmlpatterns \
     qwt-qt5 \
-    ${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPL-3.0', '', '${PN}-gplv3', d)} \
 "
 
 RDEPENDS_${PN}-tests = " \
-    qt5-opengles2-test \
     cinematicexperience \
     cinematicexperience-tools \
+    qt5-opengles2-test \
 "
 
 RDEPENDS_${PN}-tools = " \
-    qttools-tools \
     qtdeclarative-tools \
+    qttools-tools \
 "
 
 RDEPENDS_${PN}-translations = " \
@@ -79,6 +79,7 @@ RDEPENDS_${PN}-gplv3 = " \
 "
 
 RRECOMMENDS_${PN}-examples = " \
+    qmlbench \
     qtbase-examples \
     qtcharts-examples \
     qtdatavis3d \
@@ -97,6 +98,5 @@ RRECOMMENDS_${PN}-examples = " \
     qtwebchannel-examples \
     qtwebsockets-examples \
     qtxmlpatterns-examples \
-    qmlbench \
 "
 

recipes-bsp/packagegroups/packagegroup-guf-small.bb

 DESCRIPTION = "SECO Northern Europe image contents for small images"
 
-inherit packagegroup
-inherit on_bootloader
+inherit packagegroup on_bootloader
 
 PACKAGES = " \
     ${PN} \
@@ -11,6 +10,7 @@ RDEPENDS_${PN} = " \
     busybox \
     can-utils \
     ethtool \
+    fuse-exfat \
     gfeeprom \
     less \
     libgpiod \
@@ -19,6 +19,7 @@ RDEPENDS_${PN} = " \
     libsocketcan \
     ltp-guf-tests \
     mmc-utils \
+    ntfs-3g \
     packagegroup-guf-minimal \
     packagegroup-guf-networking \
     pciutils \
@@ -26,9 +27,7 @@ RDEPENDS_${PN} = " \
     tslib-calibrate \
     tslib-tests \
     udev-extraconf \
-    fuse-exfat \
     util-linux \
-    ntfs-3g \
     ${@ on_bootloader_uboot(d,' \
         libubootenv \
         libubootenv-bin \

recipes-bsp/packagegroups/packagegroup-guf-tests.bb

@@ -3,13 +3,13 @@ DESCRIPTION = "SECO Northern Europe test packagegroup"
 inherit packagegroup
 
 PACKAGES = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     ${PN} \
     ${PN}-full \
-    ${PN}-gplv3 \
 "
 
 RDEPENDS_${PN} = " \
-    ${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPL-3.0', '', '${PN}-gplv3', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
     bbb \
     beep \
     devmem2 \