From patchwork Thu Oct 12 05:25:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 32010 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 D172CCDB47E for ; Thu, 12 Oct 2023 05:25:09 +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.4901.1697088307436984163 for ; Wed, 11 Oct 2023 22:25:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=U/nknsXS; 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=8649d0404b=changqing.li@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39C5BEnN009455 for ; Wed, 11 Oct 2023 22:25:07 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PPS06212021; bh=kjsok tVhbb8s3+RAAkX92TRhGLYQp/djzLadyJPw4kQ=; b=U/nknsXSUfgAlgTYZ+SKT RmTU8H0nVqB58F3A7gujCupf92/pETmizbGc/VcuebFFN/RyxPM831AviJXpCiqn VPXb2f6WNZVDw7lF6ecX/SadYtSqLZhKsdHMyyHS4Yyc9RJCAxtHrCgioxH+fQrb iNrVTmhHrC8TAiq0CP0cwZrGgiZNafL1zAnJujR2NDFGINCANeSNAKKeklqk2Cum cj/0AqEIYWNP2ffXgKL0bOLhkMi20QYlFKy4VnKeyU5AOyEhA6ZLrn2i/Uvka+st /b8EZrkK+RJFjnmXv2wL/zeWgn1PrIuZwh/Mg4Hp3b3U/pwAyKypI+7YQwL4DDZ9 A== Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3tnhq494pr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 11 Oct 2023 22:25:06 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Wed, 11 Oct 2023 22:25:05 -0700 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.32 via Frontend Transport; Wed, 11 Oct 2023 22:25:05 -0700 From: To: Subject: [master][PATCH] meta-cgl-common: fix ParseError Date: Thu, 12 Oct 2023 13:25:04 +0800 Message-ID: <20231012052504.592900-1-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ouGGGd6Qm4kMIQb-bEmMZIyKcAl60zu0 X-Proofpoint-GUID: ouGGGd6Qm4kMIQb-bEmMZIyKcAl60zu0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-12_02,2023-10-11_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 adultscore=0 clxscore=1011 mlxlogscore=783 phishscore=0 mlxscore=0 spamscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2309180000 definitions=main-2310120045 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 ; Thu, 12 Oct 2023 05:25:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61324 From: Changqing Li Layeindex update.py report warning: WARNING: Error parsing distro configuration file /meta-cgl/meta-cgl-common/conf/distro/poky-cgl.conf: ParseError at /meta-cgl/meta-cgl-common/conf/distro/poky-cgl.conf:1: Could not include required file conf/distro/poky-lsb.conf Refer meta-yocto commit: 00fdefff55717331a220fe624f29c387970d31d7 [poky-altcfg: Replace poky-lsb with poky-altcfg] replace poky-lsb with poky-altcfg here, and also add layer yocto as LAYERDEPENDS for fixing above warning Signed-off-by: Changqing Li --- meta-cgl-common/conf/distro/poky-cgl.conf | 2 +- meta-cgl-common/conf/layer.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-cgl-common/conf/distro/poky-cgl.conf b/meta-cgl-common/conf/distro/poky-cgl.conf index 10feab9..2932dcf 100644 --- a/meta-cgl-common/conf/distro/poky-cgl.conf +++ b/meta-cgl-common/conf/distro/poky-cgl.conf @@ -1,4 +1,4 @@ -require conf/distro/poky-lsb.conf +require conf/distro/poky-altcfg.conf DISTRO = "poky-cgl" DISTROOVERRIDES .= ":poky-cgl" diff --git a/meta-cgl-common/conf/layer.conf b/meta-cgl-common/conf/layer.conf index fe81bcc..2a280e4 100644 --- a/meta-cgl-common/conf/layer.conf +++ b/meta-cgl-common/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "cgl-common" BBFILE_PATTERN_cgl-common = "^${LAYERDIR}/" BBFILE_PRIORITY_cgl-common = "7" -LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security selinux" +LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security selinux yocto" LAYERSERIES_COMPAT_cgl-common = "honister kirkstone langdale mickledore"