[yocto] [meta-security][PATCH] layer.conf: Update for zeus series

[akuster808]

On 10/11/19 12:51 AM, Martin Jansa wrote:
> Acked-by: Martin Jansa <Martin.Jansa at gmail.com
> <mailto:Martin.Jansa at gmail.com>>
>
> Please merge this to unblock CI.

done

>
> On Wed, Oct 9, 2019 at 12:55 AM Armin Kuster <akuster808 at gmail.com
> <mailto:akuster808 at gmail.com>> wrote:
>
>     Signed-off-by: Armin Kuster <akuster808 at gmail.com
>     <mailto:akuster808 at gmail.com>>
>     ---
>      conf/layer.conf                          | 2 +-
>      meta-integrity/conf/layer.conf           | 2 +-
>      meta-security-compliance/conf/layer.conf | 2 +-
>      meta-tpm/conf/layer.conf                 | 2 +-
>      4 files changed, 4 insertions(+), 4 deletions(-)
>
>     diff --git a/conf/layer.conf b/conf/layer.conf
>     index b9a4f25..3e890e1 100644
>     --- a/conf/layer.conf
>     +++ b/conf/layer.conf
>     @@ -9,6 +9,6 @@ BBFILE_COLLECTIONS += "security"
>      BBFILE_PATTERN_security = "^${LAYERDIR}/"
>      BBFILE_PRIORITY_security = "8"
>
>     -LAYERSERIES_COMPAT_security = "warrior"
>     +LAYERSERIES_COMPAT_security = "zeus"
>
>      LAYERDEPENDS_security = "core openembedded-layer perl-layer
>     networking-layer meta-python"
>     diff --git a/meta-integrity/conf/layer.conf
>     b/meta-integrity/conf/layer.conf
>     index 41989da..962424c 100644
>     --- a/meta-integrity/conf/layer.conf
>     +++ b/meta-integrity/conf/layer.conf
>     @@ -21,6 +21,6 @@ INTEGRITY_BASE := '${LAYERDIR}'
>      # interactive shell is enough.
>      OE_TERMINAL_EXPORTS += "INTEGRITY_BASE"
>
>     -LAYERSERIES_COMPAT_integrity = "warrior"
>     +LAYERSERIES_COMPAT_integrity = "zeus"
>      # ima-evm-utils depends on keyutils from meta-oe
>      LAYERDEPENDS_integrity = "core openembedded-layer"
>     diff --git a/meta-security-compliance/conf/layer.conf
>     b/meta-security-compliance/conf/layer.conf
>     index 9ccadab..0e93bd0 100644
>     --- a/meta-security-compliance/conf/layer.conf
>     +++ b/meta-security-compliance/conf/layer.conf
>     @@ -8,6 +8,6 @@ BBFILE_COLLECTIONS += "scanners-layer"
>      BBFILE_PATTERN_scanners-layer = "^${LAYERDIR}/"
>      BBFILE_PRIORITY_scanners-layer = "10"
>
>     -LAYERSERIES_COMPAT_scanners-layer = "warrior"
>     +LAYERSERIES_COMPAT_scanners-layer = "zeus"
>
>      LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python"
>     diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf
>     index cdccc55..3af2d95 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 = "warrior"
>     +LAYERSERIES_COMPAT_tpm-layer = "zeus"
>
>      LAYERDEPENDS_tpm-layer = " \
>          core \
>     -- 
>     2.17.1
>
>     -- 
>     _______________________________________________
>     yocto mailing list
>     yocto at yoctoproject.org <mailto:yocto at yoctoproject.org>
>     https://lists.yoctoproject.org/listinfo/yocto
>
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20191011/61151d73/attachment.html>