From 6cccd3e112c5fa4fa36fe825821287f2b7784493 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 23 Dec 2024 22:58:28 -0800 Subject: [PATCH] libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11 So that PARSE_ALL_RECIPES will work. (From OE-Core rev: c925098dc0faf2b69637de914958557b23615c7a) Signed-off-by: Robert Yang Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 2131f46213..4286e0ccb1 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"