diff mbox series

[meta-security,1/2] layer: drop styhead, add whinlatter

Message ID 20250701100013.826-1-liuyd.fnst@fujitsu.com
State New
Headers show
Series [meta-security,1/2] layer: drop styhead, add whinlatter | expand

Commit Message

Yiding Liu (Fujitsu) July 1, 2025, 10 a.m. UTC
fix the issue:
ERROR: Layer security is not compatible with the core layer which only supports these series: whinlatter (layer is compatible with styhead walnascar)

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 conf/layer.conf                | 2 +-
 meta-hardening/conf/layer.conf | 2 +-
 meta-integrity/conf/layer.conf | 2 +-
 meta-parsec/conf/layer.conf    | 2 +-
 meta-tpm/conf/layer.conf       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Comments

Gyorgy Sarvari July 2, 2025, 8:24 a.m. UTC | #1
On 7/1/25 12:00, Yiding Liu (Fujitsu) via lists.yoctoproject.org wrote:
> fix the issue:
> ERROR: Layer security is not compatible with the core layer which only supports these series: whinlatter (layer is compatible with styhead walnascar)
>
> Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
> ---
>  conf/layer.conf                | 2 +-
>  meta-hardening/conf/layer.conf | 2 +-
>  meta-integrity/conf/layer.conf | 2 +-
>  meta-parsec/conf/layer.conf    | 2 +-
>  meta-tpm/conf/layer.conf       | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 84d40a1..7c8e403 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "security"
>  BBFILE_PATTERN_security = "^${LAYERDIR}/"
>  BBFILE_PRIORITY_security = "8"
>  
> -LAYERSERIES_COMPAT_security = "styhead walnascar"
> +LAYERSERIES_COMPAT_security = "whinlatter walnascar"

I'm not sure if this combination is valid, in case the layer fetches any
source from git - I believe it can be compatible with whinlatter, or
with others.
Yiding Liu (Fujitsu) July 2, 2025, 9:18 a.m. UTC | #2
> -----邮件原件-----
> 发件人: Gyorgy Sarvari <skandigraun@gmail.com>
> 发送时间: 2025年7月2日 16:24
> 收件人: yocto-patches@lists.yoctoproject.org
> 抄送: Ma, Xinjian/马 新建 <maxj.fnst@fujitsu.com>; Liu, Yiding/刘 乙丁
> <liuyd.fnst@fujitsu.com>
> 主题: Re: [yocto-patches] [meta-security][PATCH 1/2] layer: drop styhead, add
> whinlatter
> 
> On 7/1/25 12:00, Yiding Liu (Fujitsu) via lists.yoctoproject.org wrote:
> > fix the issue:
> > ERROR: Layer security is not compatible with the core layer which only
> > supports these series: whinlatter (layer is compatible with styhead
> > walnascar)
> >
> > Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
> > ---
> >  conf/layer.conf                | 2 +-
> >  meta-hardening/conf/layer.conf | 2 +-  meta-integrity/conf/layer.conf
> > | 2 +-
> >  meta-parsec/conf/layer.conf    | 2 +-
> >  meta-tpm/conf/layer.conf       | 2 +-
> >  5 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/conf/layer.conf b/conf/layer.conf index 84d40a1..7c8e403
> > 100644
> > --- a/conf/layer.conf
> > +++ b/conf/layer.conf
> > @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "security"
> >  BBFILE_PATTERN_security = "^${LAYERDIR}/"
> >  BBFILE_PRIORITY_security = "8"
> >
> > -LAYERSERIES_COMPAT_security = "styhead walnascar"
> > +LAYERSERIES_COMPAT_security = "whinlatter walnascar"
> 
> I'm not sure if this combination is valid, in case the layer fetches any source from
> git - I believe it can be compatible with whinlatter, or with others.


Thank you.
But I don't know how to test it.
Add new version and remove old version like others do.

Then I will leave this patch as it is for now, and send a patch V2 for another 2/2 patch. Since We need it urgently


Yiding
Scott Murray July 2, 2025, 11:01 p.m. UTC | #3
On Wed, 2 Jul 2025, Yiding Liu (Fujitsu) via lists.yoctoproject.org wrote:

> > -----锟绞硷拷原锟斤拷-----
> > 锟斤拷锟斤拷锟斤拷: Gyorgy Sarvari <skandigraun@gmail.com>
> > 锟斤拷锟斤拷时锟斤拷: 2025锟斤拷7锟斤拷2锟斤拷 16:24
> > 锟秸硷拷锟斤拷: yocto-patches@lists.yoctoproject.org
> > 锟斤拷锟斤拷: Ma, Xinjian/锟斤拷 锟铰斤拷 <maxj.fnst@fujitsu.com>; Liu, Yiding/锟斤拷 锟揭讹拷
> > <liuyd.fnst@fujitsu.com>
> > 锟斤拷锟斤拷: Re: [yocto-patches] [meta-security][PATCH 1/2] layer: drop styhead, add
> > whinlatter
> >
> > On 7/1/25 12:00, Yiding Liu (Fujitsu) via lists.yoctoproject.org wrote:
> > > fix the issue:
> > > ERROR: Layer security is not compatible with the core layer which only
> > > supports these series: whinlatter (layer is compatible with styhead
> > > walnascar)
> > >
> > > Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
> > > ---
> > >  conf/layer.conf                | 2 +-
> > >  meta-hardening/conf/layer.conf | 2 +-  meta-integrity/conf/layer.conf
> > > | 2 +-
> > >  meta-parsec/conf/layer.conf    | 2 +-
> > >  meta-tpm/conf/layer.conf       | 2 +-
> > >  5 files changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/conf/layer.conf b/conf/layer.conf index 84d40a1..7c8e403
> > > 100644
> > > --- a/conf/layer.conf
> > > +++ b/conf/layer.conf
> > > @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "security"
> > >  BBFILE_PATTERN_security = "^${LAYERDIR}/"
> > >  BBFILE_PRIORITY_security = "8"
> > >
> > > -LAYERSERIES_COMPAT_security = "styhead walnascar"
> > > +LAYERSERIES_COMPAT_security = "whinlatter walnascar"
> >
> > I'm not sure if this combination is valid, in case the layer fetches any source from
> > git - I believe it can be compatible with whinlatter, or with others.
>
>
> Thank you.
> But I don't know how to test it.
> Add new version and remove old version like others do.
>
> Then I will leave this patch as it is for now, and send a patch V2 for another 2/2 patch. Since We need it urgently

No need, I am working up a patch set that includes this, and Gyorgy is
correct; it makes no sense for the layers to say they support anything
other than whinlatter, as there are a lot recipes that will not be
backwards compatible due to the S/UNPACKDIR changes.

Scott
diff mbox series

Patch

diff --git a/conf/layer.conf b/conf/layer.conf
index 84d40a1..7c8e403 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,7 +9,7 @@  BBFILE_COLLECTIONS += "security"
 BBFILE_PATTERN_security = "^${LAYERDIR}/"
 BBFILE_PRIORITY_security = "8"
 
-LAYERSERIES_COMPAT_security = "styhead walnascar"
+LAYERSERIES_COMPAT_security = "whinlatter walnascar"
 
 LAYERDEPENDS_security = "core openembedded-layer"
 
diff --git a/meta-hardening/conf/layer.conf b/meta-hardening/conf/layer.conf
index a7e32e5..d633f8e 100644
--- a/meta-hardening/conf/layer.conf
+++ b/meta-hardening/conf/layer.conf
@@ -8,7 +8,7 @@  BBFILE_COLLECTIONS += "harden-layer"
 BBFILE_PATTERN_harden-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_harden-layer = "6"
 
-LAYERSERIES_COMPAT_harden-layer = "styhead walnascar"
+LAYERSERIES_COMPAT_harden-layer = "whinlatter walnascar"
 
 LAYERDEPENDS_harden-layer = "core openembedded-layer"
 
diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
index 33127c7..d26d753 100644
--- a/meta-integrity/conf/layer.conf
+++ b/meta-integrity/conf/layer.conf
@@ -20,7 +20,7 @@  INTEGRITY_BASE := '${LAYERDIR}'
 # interactive shell is enough.
 OE_TERMINAL_EXPORTS += "INTEGRITY_BASE"
 
-LAYERSERIES_COMPAT_integrity = "styhead walnascar"
+LAYERSERIES_COMPAT_integrity = "whinlatter walnascar"
 # ima-evm-utils depends on keyutils from meta-oe
 LAYERDEPENDS_integrity = "core openembedded-layer"
 
diff --git a/meta-parsec/conf/layer.conf b/meta-parsec/conf/layer.conf
index 614c17e..6cee051 100644
--- a/meta-parsec/conf/layer.conf
+++ b/meta-parsec/conf/layer.conf
@@ -8,7 +8,7 @@  BBFILE_COLLECTIONS += "parsec-layer"
 BBFILE_PATTERN_parsec-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_parsec-layer = "5"
 
-LAYERSERIES_COMPAT_parsec-layer = "walnascar styhead nanbield scarthgap"
+LAYERSERIES_COMPAT_parsec-layer = "whinlatter walnascar styhead nanbield scarthgap"
 
 LAYERDEPENDS_parsec-layer = "core clang-layer"
 BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec"
diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf
index 5f96114..7bd14e1 100644
--- a/meta-tpm/conf/layer.conf
+++ b/meta-tpm/conf/layer.conf
@@ -8,7 +8,7 @@  BBFILE_COLLECTIONS += "tpm-layer"
 BBFILE_PATTERN_tpm-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_tpm-layer = "6"
 
-LAYERSERIES_COMPAT_tpm-layer = "styhead walnascar"
+LAYERSERIES_COMPAT_tpm-layer = "whinlatter walnascar"
 
 LAYERDEPENDS_tpm-layer = " \
     core \