From 18d65f89333b1a8482aab9183b143d18b44e9057 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Fri, 25 May 2018 14:44:24 -0400 Subject: layer.conf: add LAYERSERIES_COMPAT see https://patchwork.openembedded.org/patch/140542/ Signed-off-by: Trevor Woerner --- meta-efi-secure-boot/conf/layer.conf | 2 ++ meta-encrypted-storage/conf/layer.conf | 2 ++ meta-ids/conf/layer.conf | 2 ++ meta-integrity/conf/layer.conf | 2 ++ meta-signing-key/conf/layer.conf | 2 ++ meta-tpm/conf/layer.conf | 2 ++ meta-tpm2/conf/layer.conf | 2 ++ meta/conf/layer.conf | 2 ++ 8 files changed, 16 insertions(+) diff --git a/meta-efi-secure-boot/conf/layer.conf b/meta-efi-secure-boot/conf/layer.conf index e725335..be3c1f0 100644 --- a/meta-efi-secure-boot/conf/layer.conf +++ b/meta-efi-secure-boot/conf/layer.conf @@ -17,3 +17,5 @@ LAYERDEPENDS_efi-secure-boot = "\ signing-key \ perl-layer \ " + +LAYERSERIES_COMPAT_efi-secure-boot = "sumo" diff --git a/meta-encrypted-storage/conf/layer.conf b/meta-encrypted-storage/conf/layer.conf index 0f3ec40..9772e96 100644 --- a/meta-encrypted-storage/conf/layer.conf +++ b/meta-encrypted-storage/conf/layer.conf @@ -16,3 +16,5 @@ LAYERDEPENDS_encrypted-storage = "\ tpm2 \ openembedded-layer \ " + +LAYERSERIES_COMPAT_encrypted-storage = "sumo" diff --git a/meta-ids/conf/layer.conf b/meta-ids/conf/layer.conf index 00f6f1b..a2f29c9 100644 --- a/meta-ids/conf/layer.conf +++ b/meta-ids/conf/layer.conf @@ -15,3 +15,5 @@ LAYERDEPENDS_ids = "\ core \ networking-layer \ " + +LAYERSERIES_COMPAT_ids = "sumo" diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf index 67eb755..2565080 100644 --- a/meta-integrity/conf/layer.conf +++ b/meta-integrity/conf/layer.conf @@ -26,3 +26,5 @@ LAYERRECOMMENDS_integrity = "\ BB_HASHBASE_WHITELIST_append += "\ RPM_FSK_PATH \ " + +LAYERSERIES_COMPAT_integrity = "sumo" diff --git a/meta-signing-key/conf/layer.conf b/meta-signing-key/conf/layer.conf index e067f6b..1b735d2 100644 --- a/meta-signing-key/conf/layer.conf +++ b/meta-signing-key/conf/layer.conf @@ -13,6 +13,8 @@ BBLAYERS_LAYERINDEX_NAME_signing-key = "meta-signing-key" LAYERDEPENDS_signing-key = "core" +LAYERSERIES_COMPAT_signing-key = "sumo" + SIGNING_MODEL ??= "sample" SAMPLE_MOK_SB_KEYS_DIR = "${LAYERDIR}/files/mok_sb_keys" SAMPLE_UEFI_SB_KEYS_DIR = "${LAYERDIR}/files/uefi_sb_keys" diff --git a/meta-tpm/conf/layer.conf b/meta-tpm/conf/layer.conf index d767fb2..2b9964a 100644 --- a/meta-tpm/conf/layer.conf +++ b/meta-tpm/conf/layer.conf @@ -12,3 +12,5 @@ BBFILE_PRIORITY_tpm = "10" BBLAYERS_LAYERINDEX_NAME_tpm = "meta-tpm" LAYERDEPENDS_tpm = "core" + +LAYERSERIES_COMPAT_tpm = "sumo" diff --git a/meta-tpm2/conf/layer.conf b/meta-tpm2/conf/layer.conf index c39e063..3842160 100644 --- a/meta-tpm2/conf/layer.conf +++ b/meta-tpm2/conf/layer.conf @@ -12,3 +12,5 @@ BBFILE_PRIORITY_tpm2 = "10" BBLAYERS_LAYERINDEX_NAME_tpm2 = "meta-tpm2" LAYERDEPENDS_tpm2 = "core" + +LAYERSERIES_COMPAT_tpm2 = "sumo" diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 729dd1e..4caf70c 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -14,3 +14,5 @@ BBLAYERS_LAYERINDEX_NAME_secure-core = "meta-secure-core" LAYERDEPENDS_secure-core = "\ core \ " + +LAYERSERIES_COMPAT_secure-core = "sumo" -- cgit v1.2.3-54-g00ecf