| Message ID | 20231012052504.592900-1-changqing.li@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [master] meta-cgl-common: fix ParseError | expand |
Merged, thanks! Make sure to put the repo in the subject when submitting. On 10/11/2023 10:25 PM, Changqing Li wrote: > From: Changqing Li <changqing.li@windriver.com> > > 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 <changqing.li@windriver.com> > --- > 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" > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#61324): https://lists.yoctoproject.org/g/yocto/message/61324 > Mute This Topic: https://lists.yoctoproject.org/mt/101912916/2167262 > Group Owner: yocto+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [jpuhlman@mvista.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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"