From c49aafdb8182fb78fda2831e32cadb39068285cc Mon Sep 17 00:00:00 2001
From: Marta Rybczynska <marta.rybczynska@huawei.com>
Date: Thu, 18 Aug 2022 16:32:22 +0200
Subject: [PATCH] meta-oniro-core: enable tpm as a distro feature
Enable TPM-related distro features. We're interested in TPM2, so
we need to enable both tpm and tpm2.
Also enable security dependencies. The dependency on meta-security
we have already had before, now add also tpm and tpm2 as we enable
the feature.
As a next step we need to enable related MACHINE_FEATURES for the
machines TPM (or software TPM) is available.
Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
---
meta-oniro-core/conf/distro/oniro-linux.conf | 2 +-
meta-oniro-core/conf/layer.conf | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 0ce27d0b..37e882ea 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -18,7 +18,7 @@ DISTRO_VERSION[vardepsexclude] = "DATE"
SDK_VERSION[vardepsexclude] = "DATE"
# Override these in oniro based distros
-ONIRO_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch pam rauc security wayland vulkan virtualization"
+ONIRO_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch pam rauc security tpm tpm2 wayland vulkan virtualization"
ONIRO_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
ONIRO_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
diff --git a/meta-oniro-core/conf/layer.conf b/meta-oniro-core/conf/layer.conf
index 5569deb9..9c200ef1 100644
--- a/meta-oniro-core/conf/layer.conf
+++ b/meta-oniro-core/conf/layer.conf
@@ -20,6 +20,9 @@ LAYERDEPENDS_oniro-core = " \
networking-layer \
raspberrypi \
rauc \
+ security \
+ tpm-layer \
+ tpm2 \
"
LAYERSERIES_COMPAT_oniro-core = "kirkstone"
--
GitLab