From 92f744ab754de6478980384c20dbdf878831f457 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 10 Feb 2016 18:48:00 +0100 Subject: [PATCH] meta-digi-dey: move ${GRAPHICAL_BACKEND} to DEY distro conf Move this variable to DEY distro conf so that it is available for any recipe built with the distro. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-2192 --- meta-digi-dey/conf/distro/dey.conf | 2 ++ meta-digi-dey/recipes-core/images/dey-image-qt.bb | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 99c6c647e..d095b350d 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -23,6 +23,8 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DE # 'ptest' -> fails to build QT5 toolchain POKY_DEFAULT_DISTRO_FEATURES_remove = "ptest wayland" +GRAPHICAL_BACKEND = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d)}" + # DEY image features (alphabetical order) FEATURE_PACKAGES_dey-audio = "packagegroup-dey-audio" FEATURE_PACKAGES_dey-bluetooth = "packagegroup-dey-bluetooth" diff --git a/meta-digi-dey/recipes-core/images/dey-image-qt.bb b/meta-digi-dey/recipes-core/images/dey-image-qt.bb index ac1aff218..454741b2a 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-qt.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-qt.bb @@ -42,6 +42,4 @@ IMAGE_ROOTFS_SIZE = "8192" # Do not install udev-cache BAD_RECOMMENDATIONS += "udev-cache" -GRAPHICAL_BACKEND = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d)}" - export IMAGE_BASENAME = "dey-image-qt-${GRAPHICAL_BACKEND}"