From patchwork Tue Dec 24 06:58:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 54588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD1E7E77188 for ; Tue, 24 Dec 2024 06:58:39 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.29294.1735023509618012190 for ; Mon, 23 Dec 2024 22:58:29 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=2088af2719=liezhi.yang@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4BO6SvwF015686 for ; Mon, 23 Dec 2024 22:58:29 -0800 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 43nsub2ayn-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 23 Dec 2024 22:58:29 -0800 (PST) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Mon, 23 Dec 2024 22:58:28 -0800 Received: from ala-lpggp7.wrs.com (147.11.136.210) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Mon, 23 Dec 2024 22:58:28 -0800 From: To: Subject: [PATCH 1/1] libx11-compose-data: Use CONFLICT_DISTRO_FEATURES to skip when x11 Date: Mon, 23 Dec 2024 22:58:28 -0800 Message-ID: <9fc3a1d8438cba065e0827df1ce9ae6efcea08d9.1735023394.git.liezhi.yang@windriver.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: References: MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=Ns8rc9dJ c=1 sm=1 tr=0 ts=676a5b95 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=RZcAm9yDv7YA:10 a=t7CeM3EgAAAA:8 a=YMQUhJJa0IeMWPf0rssA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: yPGxqPo7ovpaahZsW7QcPrwQp1-Ggl_U X-Proofpoint-ORIG-GUID: yPGxqPo7ovpaahZsW7QcPrwQp1-Ggl_U X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-12-24_02,2024-12-24_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 spamscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2412240055 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Dec 2024 06:58:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209059 From: Robert Yang So that PARSE_ALL_RECIPES will work. Signed-off-by: Robert Yang --- 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"