libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11

So that PARSE_ALL_RECIPES will work.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 2131f46213cc6a46ccac2b9c517401eb2698aa15..4286e0ccb1135673fb3ae054b9b8d286a17a624b 100644 (file)
--- 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"