From 3c8f0d7f618b776fc55e25ea8209635479e260fd Mon Sep 17 00:00:00 2001 From: Tobias Poganiuch <tobias.poganiuch@garz-fricke.com> Date: Fri, 3 Jun 2022 11:23:39 +0200 Subject: [PATCH] distro: Rework of nogplv3 distro The nogplv3 distro now includes the default guf-wayland distro and only removes the gplv3 distro feature. --- conf/distro/guf-wayland-no-gplv3.conf | 26 +++----------------------- conf/distro/guf-wayland.conf | 2 +- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/conf/distro/guf-wayland-no-gplv3.conf b/conf/distro/guf-wayland-no-gplv3.conf index c8e593f3..d905588a 100644 --- a/conf/distro/guf-wayland-no-gplv3.conf +++ b/conf/distro/guf-wayland-no-gplv3.conf @@ -1,25 +1,5 @@ -# GUF Distro for Wayland. +require conf/distro/guf-wayland.conf -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" +# Remove support for GPLv3 +DISTRO_FEATURES_remove = "gplv3" diff --git a/conf/distro/guf-wayland.conf b/conf/distro/guf-wayland.conf index f8489648..9b33b898 100644 --- a/conf/distro/guf-wayland.conf +++ b/conf/distro/guf-wayland.conf @@ -15,7 +15,7 @@ DISTRO_FEATURES_append = " wayland" DISTRO_FEATURES_append = " opengl vulkan" # Add support for GPLv3 -DISTRO_FEATURES_append = " gplv3" +DISTRO_FEATURES += "gplv3" # Default is busybox # Recommandation from poky/meta-poky/conf/local.conf.sample.extended -- GitLab