[PATCH 0/1] libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11

[PATCH 0/1] libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11

[liezhi.yang]

From: Robert Yang <liezhi.yang@windriver.com>

The following changes since commit 1a2afcd0773c5ec5946d1dfc27bde585c52a5724:

  base/features_check: Make PARSE_ALL_RECIPES and SOURCE_MIRROR_FETCH boolean (2024-12-23 11:41:13 +0000)

are available in the Git repository at:

  https://github.com/robertlinux/yocto rbt/x11
  https://github.com/robertlinux/yocto/tree/rbt/x11

Robert Yang (1):
  libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11

 meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

-- 
2.44.1

[PATCH 1/1] libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11

[liezhi.yang]

From: Robert Yang <liezhi.yang@windriver.com>

So that PARSE_ALL_RECIPES will work.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 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"
 
-- 
2.44.1

Re: [OE-core] [PATCH 0/1] libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11

[Robert Yang]

ping.

// Robert

On 12/24/24 14:58, Robert Yang via lists.openembedded.org wrote:
> From: Robert Yang <liezhi.yang@windriver.com>
> 
> The following changes since commit 1a2afcd0773c5ec5946d1dfc27bde585c52a5724:
> 
>    base/features_check: Make PARSE_ALL_RECIPES and SOURCE_MIRROR_FETCH boolean (2024-12-23 11:41:13 +0000)
> 
> are available in the Git repository at:
> 
>    https://github.com/robertlinux/yocto rbt/x11
>    https://github.com/robertlinux/yocto/tree/rbt/x11
> 
> Robert Yang (1):
>    libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11
> 
>   meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb | 6 +-----
>   1 file changed, 1 insertion(+), 5 deletions(-)
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#209058): https://lists.openembedded.org/g/openembedded-core/message/209058
> Mute This Topic: https://lists.openembedded.org/mt/110269162/7304958
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [liezhi.yang@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>