From 7e636ac070f5d89a3d98d7fafa058f751747bbf9 Mon Sep 17 00:00:00 2001
From: Marta Rybczynska <marta.rybczynska@huawei.com>
Date: Tue, 9 Aug 2022 07:29:08 +0200
Subject: [PATCH] bblayers.conf.sample: add LEDGE layers and dependencies
Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
---
flavours/linux/bblayers.conf.sample | 10 +++++++++-
meta-oniro-core/conf/distro/include/oniro.inc | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/flavours/linux/bblayers.conf.sample b/flavours/linux/bblayers.conf.sample
index efef18fd..4cdb9e29 100644
--- a/flavours/linux/bblayers.conf.sample
+++ b/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 \
"
diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc
index 12e14f5e..dd5200c5 100644
--- a/meta-oniro-core/conf/distro/include/oniro.inc
+++ b/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
--
GitLab