From 36cdf244253918fd41d31d2ed202a9f5abdb22d7 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 28 Oct 2013 17:14:17 +0100 Subject: [PATCH] meta-digi-dey: move packagegroup definitions to distro configuration After the upstream commit in d63c8a1597c9bd0a838cb59ca461ac432b630a90, bitbake checks to see if the image feature has a valid packagegroup associated. For this check to work dey features need to be defined for all images, not only dey images, so the definitions need to move to the distro configuration file. https://jira.digi.com/browse/DEL-852 Signed-off-by: Alex Gonzalez Signed-off-by: Javier Viguera --- meta-digi-dey/classes/dey-image.bbclass | 10 ---------- meta-digi-dey/conf/distro/dey.conf | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-digi-dey/classes/dey-image.bbclass b/meta-digi-dey/classes/dey-image.bbclass index 527db9855..8d6aa026f 100644 --- a/meta-digi-dey/classes/dey-image.bbclass +++ b/meta-digi-dey/classes/dey-image.bbclass @@ -2,16 +2,6 @@ # # Copyright (C) 2012 Digi International. -# DEY image features (alphabetical order) -PACKAGE_GROUP_dey-audio = "packagegroup-dey-audio" -PACKAGE_GROUP_dey-bluetooth = "packagegroup-dey-bluetooth" -PACKAGE_GROUP_dey-debug = "packagegroup-dey-debug" -PACKAGE_GROUP_dey-examples = "packagegroup-dey-examples" -PACKAGE_GROUP_dey-gstreamer = "packagegroup-dey-gstreamer" -PACKAGE_GROUP_dey-network = "packagegroup-dey-network" -PACKAGE_GROUP_dey-qt = "packagegroup-dey-qt" -PACKAGE_GROUP_dey-wireless = "packagegroup-dey-wireless" - ## Auxiliar variables and functions (used in dey_rootfs_tuning) LAYERS_REV = "${@'\n'.join(get_layers_branch_rev(d))}" DEY_TAG = "${@dey_tag(d).strip()}" diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 0ad0e888e..efa7fd0bc 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -24,6 +24,16 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DE DISTRO_FEATURES_DEFAULT_remove = "x11" POKY_DEFAULT_DISTRO_FEATURES_remove = "wayland" +# DEY image features (alphabetical order) +PACKAGE_GROUP_dey-audio = "packagegroup-dey-audio" +PACKAGE_GROUP_dey-bluetooth = "packagegroup-dey-bluetooth" +PACKAGE_GROUP_dey-debug = "packagegroup-dey-debug" +PACKAGE_GROUP_dey-examples = "packagegroup-dey-examples" +PACKAGE_GROUP_dey-gstreamer = "packagegroup-dey-gstreamer" +PACKAGE_GROUP_dey-network = "packagegroup-dey-network" +PACKAGE_GROUP_dey-qt = "packagegroup-dey-qt" +PACKAGE_GROUP_dey-wireless = "packagegroup-dey-wireless" + # Features without a packagegroup need to be explicitely added. IMAGE_FEATURES[validitems] += "dey-test"