Hi Armin, can you please merge this to master branch? It's in master-next for a while, but not in master and master-next is missing some changes from master as well, openscap upgrade and kas changes look different in master and master-next (which has 2 more chunks): https://git.yoctoproject.org/meta-security/commit/?id=da93339112d0a53f0008a72dcacdb55dc3bf95a8 https://git.yoctoproject.org/meta-security/commit/?h=master-next&id=04a0e35a79d33aadbec79272072dc105830007b7
Cheers, On Tue, Jan 3, 2023 at 5:36 PM Martin Jansa via lists.yoctoproject.org <[email protected]> wrote: > * oe-core switched to mickedore in: > > https://git.openembedded.org/openembedded-core/commit/?id=57239d66b933c4313cf331d35d13ec2d0661c38f > > Signed-off-by: Martin Jansa <[email protected]> > --- > conf/layer.conf | 2 +- > meta-hardening/conf/layer.conf | 2 +- > meta-integrity/conf/layer.conf | 2 +- > meta-parsec/conf/layer.conf | 2 +- > meta-security-compliance/conf/layer.conf | 2 +- > meta-security-isafw/conf/layer.conf | 2 +- > meta-tpm/conf/layer.conf | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/conf/layer.conf b/conf/layer.conf > index 470c7f6..b5a74f1 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 = "kirkstone langdale" > +LAYERSERIES_COMPAT_security = "mickledore" > > LAYERDEPENDS_security = "core openembedded-layer" > > diff --git a/meta-hardening/conf/layer.conf > b/meta-hardening/conf/layer.conf > index 5983161..add3cbc 100644 > --- a/meta-hardening/conf/layer.conf > +++ b/meta-hardening/conf/layer.conf > @@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "harden-layer" > BBFILE_PATTERN_harden-layer = "^${LAYERDIR}/" > BBFILE_PRIORITY_harden-layer = "10" > > -LAYERSERIES_COMPAT_harden-layer = "kirkstone langdale" > +LAYERSERIES_COMPAT_harden-layer = "mickledore" > > LAYERDEPENDS_harden-layer = "core openembedded-layer" > diff --git a/meta-integrity/conf/layer.conf > b/meta-integrity/conf/layer.conf > index 1fcf33c..b273b5b 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 = "kirkstone langdale" > +LAYERSERIES_COMPAT_integrity = "mickledore" > # 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 a748d77..0a71694 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 = "kirkstone langdale" > +LAYERSERIES_COMPAT_parsec-layer = "mickledore" > > LAYERDEPENDS_parsec-layer = "core clang-layer" > BBLAYERS_LAYERINDEX_NAME_parsec-layer = "meta-parsec" > diff --git a/meta-security-compliance/conf/layer.conf > b/meta-security-compliance/conf/layer.conf > index ec57541..f07532c 100644 > --- a/meta-security-compliance/conf/layer.conf > +++ b/meta-security-compliance/conf/layer.conf > @@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "scanners-layer" > BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/" > BBFILE_PRIORITY_scanners-layer = "10" > > -LAYERSERIES_COMPAT_scanners-layer = "kirkstone langdale" > +LAYERSERIES_COMPAT_scanners-layer = "mickledore" > > LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" > > diff --git a/meta-security-isafw/conf/layer.conf > b/meta-security-isafw/conf/layer.conf > index 724742d..550cced 100644 > --- a/meta-security-isafw/conf/layer.conf > +++ b/meta-security-isafw/conf/layer.conf > @@ -14,4 +14,4 @@ LAYERVERSION_security-isafw = "1" > > LAYERDEPENDS_security-isafw = "core" > > -LAYERSERIES_COMPAT_security-isafw = "kirkstone langdale" > +LAYERSERIES_COMPAT_security-isafw = "mickledore" > diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf > index 1fd2e4c..81690ca 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 = "10" > > -LAYERSERIES_COMPAT_tpm-layer = "kirkstone langdale" > +LAYERSERIES_COMPAT_tpm-layer = "mickledore" > > LAYERDEPENDS_tpm-layer = " \ > core \ > -- > 2.39.0 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#58997): https://lists.yoctoproject.org/g/yocto/message/58997 Mute This Topic: https://lists.yoctoproject.org/mt/96031444/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
