From: Robert Yang Date: Tue, 24 Dec 2024 06:58:28 +0000 (-0800) Subject: libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c925098dc0faf2b69637de914958557b23615c7a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11 So that PARSE_ALL_RECIPES will work. Signed-off-by: Robert Yang Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb index 2131f46213c..4286e0ccb11 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb @@ -1,11 +1,6 @@ SUMMARY = "Xlib: Compose data files for libx11" DESCRIPTION = "This package provides the compose data files for libx11." -python () { - if bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d): - raise bb.parse.SkipRecipe("libx11-compose-data is incompatible with x11 distro feature, use libx11 instead.") -} - require xorg-lib-common.inc LICENSE = "MIT & BSD-1-Clause & HPND & HPND-sell-variant & ISC" @@ -19,6 +14,7 @@ SRC_URI += "file://0001-Drop-x11-dependencies.patch \ SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518" REQUIRED_DISTRO_FEATURES = "" +CONFLICT_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--disable-xkb"