From e8744053191efd5d10a2471cbf8beedd482886e8 Mon Sep 17 00:00:00 2001
From: Lans Zhang <jia.zhang@windriver.com>
Date: Thu, 20 Jul 2017 14:17:27 +0800
Subject: meta-secure-core: define the oe index name

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
---
 meta-efi-secure-boot/conf/layer.conf   | 2 ++
 meta-encrypted-storage/conf/layer.conf | 2 ++
 meta-integrity/conf/layer.conf         | 2 ++
 meta-signing-key/conf/layer.conf       | 4 ++++
 meta-tpm/conf/layer.conf               | 2 ++
 meta-tpm2/conf/layer.conf              | 2 ++
 meta/conf/layer.conf                   | 2 ++
 7 files changed, 16 insertions(+)

diff --git a/meta-efi-secure-boot/conf/layer.conf b/meta-efi-secure-boot/conf/layer.conf
index f453a5c..e0adf94 100644
--- a/meta-efi-secure-boot/conf/layer.conf
+++ b/meta-efi-secure-boot/conf/layer.conf
@@ -9,6 +9,8 @@ BBFILE_COLLECTIONS += "efi-secure-boot"
 BBFILE_PATTERN_efi-secure-boot = "^${LAYERDIR}/"
 BBFILE_PRIORITY_efi-secure-boot = "10"
 
+BBLAYERS_LAYERINDEX_NAME_efi-secure-boot = "meta-efi-secure-boot"
+
 LAYERDEPENDS_efi-secure-boot = "\
     core \
     openembedded-layer \
diff --git a/meta-encrypted-storage/conf/layer.conf b/meta-encrypted-storage/conf/layer.conf
index b24954c..a225d7c 100644
--- a/meta-encrypted-storage/conf/layer.conf
+++ b/meta-encrypted-storage/conf/layer.conf
@@ -9,6 +9,8 @@ BBFILE_COLLECTIONS += "encrypted-storage"
 BBFILE_PATTERN_encrypted-storage = "^${LAYERDIR}/"
 BBFILE_PRIORITY_encrypted-storage = "10"
 
+BBLAYERS_LAYERINDEX_NAME_encrypted-storage = "meta-encrypted-storage"
+
 LAYERDEPENDS_encrypted-storage = "\
     core \
     tpm2 \
diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
index 45d7758..bee4857 100644
--- a/meta-integrity/conf/layer.conf
+++ b/meta-integrity/conf/layer.conf
@@ -11,6 +11,8 @@ BBFILE_PRIORITY_integrity = "10"
 
 IMA_SIGNING_BLACKLIST ??= "${LAYERDIR}/files/ima_signing_blacklist"
 
+BBLAYERS_LAYERINDEX_NAME_integrity = "meta-integrity"
+
 LAYERDEPENDS_integrity = "\
     core \
     signing-key \
diff --git a/meta-signing-key/conf/layer.conf b/meta-signing-key/conf/layer.conf
index eb1622d..ca720f5 100644
--- a/meta-signing-key/conf/layer.conf
+++ b/meta-signing-key/conf/layer.conf
@@ -9,6 +9,10 @@ BBFILE_COLLECTIONS += "signing-key"
 BBFILE_PATTERN_signing-key = "^${LAYERDIR}/"
 BBFILE_PRIORITY_signing-key = "10"
 
+BBLAYERS_LAYERINDEX_NAME_signing-key = "meta-signing-key"
+
+LAYERDEPENDS_signing-key = "core"
+
 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 e425b92..d767fb2 100644
--- a/meta-tpm/conf/layer.conf
+++ b/meta-tpm/conf/layer.conf
@@ -9,4 +9,6 @@ BBFILE_COLLECTIONS += "tpm"
 BBFILE_PATTERN_tpm = "^${LAYERDIR}/"
 BBFILE_PRIORITY_tpm = "10"
 
+BBLAYERS_LAYERINDEX_NAME_tpm = "meta-tpm"
+
 LAYERDEPENDS_tpm = "core"
diff --git a/meta-tpm2/conf/layer.conf b/meta-tpm2/conf/layer.conf
index 0b8656e..c39e063 100644
--- a/meta-tpm2/conf/layer.conf
+++ b/meta-tpm2/conf/layer.conf
@@ -9,4 +9,6 @@ BBFILE_COLLECTIONS += "tpm2"
 BBFILE_PATTERN_tpm2 = "^${LAYERDIR}/"
 BBFILE_PRIORITY_tpm2 = "10"
 
+BBLAYERS_LAYERINDEX_NAME_tpm2 = "meta-tpm2"
+
 LAYERDEPENDS_tpm2 = "core"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 1e20761..729dd1e 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -9,6 +9,8 @@ BBFILE_COLLECTIONS += "secure-core"
 BBFILE_PATTERN_secure-core = "^${LAYERDIR}/"
 BBFILE_PRIORITY_secure-core = "10"
 
+BBLAYERS_LAYERINDEX_NAME_secure-core = "meta-secure-core"
+
 LAYERDEPENDS_secure-core = "\
     core \
 "
-- 
cgit v1.2.3-54-g00ecf