Skip to content
Snippets Groups Projects
Commit e73bdb36 authored by Tobias Kahlki's avatar Tobias Kahlki
Browse files

gplv3: Fixed GPLv3 recipes in packagegroups

The inclusion of the GPLv3 packages was broken.
With the changes, GPLv3 packages are only build/included, when the
gplv3 feature is set in DISTRO_FEATURES.
parent 485ce4e5
No related branches found
No related tags found
1 merge request!418Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more
......@@ -8,12 +8,17 @@ 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 pam"
# add opengl
# Add opengl
DISTRO_FEATURES:append = " opengl vulkan"
# Add pam
DISTRO_FEATURES:append = " pam"
# Add GPLv3
DISTRO_FEATURES:append = " gplv3"
# Default is busybox
# Recommandation from poky/meta-poky/conf/local.conf.sample.extended
......@@ -23,4 +28,3 @@ 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"
......@@ -5,11 +5,11 @@ inherit packagegroup
PACKAGES = " \
${PN} \
${PN}-ltp \
${PN}-gplv3 \
${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
"
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 \
......
......@@ -4,11 +4,11 @@ inherit packagegroup
PACKAGES = " \
${PN} \
${PN}-gplv3 \
${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
"
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 \
......
......@@ -5,7 +5,7 @@ inherit packagegroup
PACKAGES = " \
${PN} \
${PN}-minimal \
${PN}-gplv3 \
${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
"
RDEPENDS:${PN}-minimal = " \
......@@ -13,7 +13,7 @@ RDEPENDS:${PN}-minimal = " \
"
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 \
......
......@@ -3,16 +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('INCOMPATIBLE_LICENSE', 'GPL-3.0', '', '${PN}-gplv3', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'gplv3', '${PN}-gplv3', '', d)} \
qt3d \
qtbase \
qtbase-fingerpaint \
......
......@@ -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 \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment