Skip to contentSkip to conversation

layer.conf: Update for zeus series

PATCH In review Armin Kuster 2 participants 3 messages Oct 8, 2019 – Oct 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 layer.conf: Update for zeus series

---
 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(-)
conf/layer.conf +1 -1
index b9a4f25..3e890e1 100644
@@ -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"
meta-integrity/conf/layer.conf +1 -1
index 41989da..962424c 100644
@@ -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"
meta-security-compliance/conf/layer.conf +1 -1
index 9ccadab..0e93bd0 100644
@@ -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"
meta-tpm/conf/layer.conf +1 -1
index cdccc55..3af2d95 100644
@@ -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 \
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw

Please merge this to unblock CI.

Quoted 69 lines · Armin Kuster
---
 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(-)
conf/layer.conf +1 -1
index b9a4f25..3e890e1 100644
@@ -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"

meta-integrity/conf/layer.conf +1 -1
index 41989da..962424c 100644
@@ -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"
meta-security-compliance/conf/layer.conf +1 -1
index 9ccadab..0e93bd0 100644
@@ -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"
meta-tpm/conf/layer.conf +1 -2
index cdccc55..3af2d95 100644
@@ -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
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

author
#2 lore raw
Quoted 4 lines · Martin Jansa

<mailto:[email protected]>>

Please merge this to unblock CI.

done

Quoted 75 lines

On Wed, Oct 9, 2019 at 12:55 AM Armin Kuster <[email protected] <mailto:[email protected]>> wrote:

    Signed-off-by: Armin Kuster <[email protected]
    <mailto:[email protected]>>
    ---
     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
    [email protected] <mailto:[email protected]>
    https://lists.yoctoproject.org/listinfo/yocto