flavours/linux/bblayers.conf.sample

@@ -10,7 +10,7 @@
 # ONIRO_REQUIRED_LAYERS_CONF_VERSION, update the value below to the
 # required one after you have merged in all the changes from the sample file.
 
-ONIRO_LAYERS_CONF_VERSION = "1"
+ONIRO_LAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,9 +37,17 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-openembedded/meta-python \
   ##OEROOT##/../meta-raspberrypi \
   ##OEROOT##/../meta-security \
+  ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-riscv \
   ##OEROOT##/../meta-rauc \
   ##OEROOT##/../meta-java \
   ##OEROOT##/../meta-seco-rockchip \
   ##OEROOT##/../meta-virtualization \
+  ##OEROOT##/../meta-ts/meta-trustedsubstrate \
+  ##OEROOT##/../meta-ledge-secure/meta-ledge-secure \
+  ##OEROOT##/../meta-secure-core/meta \
+  ##OEROOT##/../meta-secure-core/meta-efi-secure-boot \
+  ##OEROOT##/../meta-secure-core/meta-encrypted-storage \
+  ##OEROOT##/../meta-secure-core/meta-signing-key \
+  ##OEROOT##/../meta-secure-core/meta-tpm2 \
   "

manifests/default.xml

@@ -60,6 +60,8 @@ SPDX-FileCopyrightText: Huawei Inc.
 	<project name="oniro-core/meta-clang.git" remote="eclipse" revision="oniro/kirkstone" path="meta-clang" />
 	<project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="oniro/kirkstone" path="meta-zephyr" />
 	<project name="oniro-core/meta-openharmony.git" remote="eclipse" revision="kirkstone" path="meta-openharmony" />
+	<project name="oniro-core/third-party/forks/meta-ledge-secure.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ledge-secure" />
+	<project name="oniro-core/third-party/forks/meta-ts.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ts" />
 	<project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" />
 	<project name="distro/governance/ip-policy" remote="oniro-booting" revision="main" path="ip-policy" />
 </manifest>

meta-oniro-core/conf/distro/include/oniro.inc

@@ -18,7 +18,7 @@ BB_DANGLINGAPPENDS_WARNONLY:forcevariable = "0"
 
 # Bump this each time bblayers.conf.sample changes incompatibly. For example,
 # when integrating new layers.
-ONIRO_REQUIRED_LAYERS_CONF_VERSION = "1"
+ONIRO_REQUIRED_LAYERS_CONF_VERSION = "2"
 # oe-core's sanity check sanity_check_conffiles function only runs the
 # functions in BBLAYERS_CONF_UPDATE_FUNCS when the associated variable is not
 # None. Making sure this variable has a default value, we force running the

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"
 

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"