From 54cd084b464f76505a8fde2c697adad379e63a9d Mon Sep 17 00:00:00 2001 From: Stefan Schmidt <stefan.schmidt@huawei.com> Date: Wed, 9 Jun 2021 17:04:33 +0200 Subject: [PATCH] distros: BBMASK blueprint layer in main distribution Only use the extra recipes and bbappends we add in meta-ohos-blueprint in the blueprint distributions. This will avoid blueprint specific configurations being pulled into the main development distribution. Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> --- .../distro/allscenarios-linux-blueprint-dashboard.conf | 7 +++++++ meta-ohos-core/conf/distro/include/allscenarios.inc | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf index fffb5367..ae0eae20 100644 --- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf +++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf @@ -16,6 +16,13 @@ DISTRO_NAME = "AllScenariOS Dashboard Blueprint Linux Distro" # The gateway would run on a stm32mp1-av96 machine. hostname_base-files_stm32mp1-av96 = "blueprint-dashboard-gateway" +# With our layer setup we would add any bbappend found from our +# layers.conf. This means blueprint-specific appends would leak +# into the package in our main distribution. To avoid this we +# mask out the blueprint layers in the main distro and unmask +# them only the blueprint distributions. +BBMASK = "" + # Avoid build warning(s) for ununsed extra partitions. ST_VENDORFS = "0" ST_USERFS = "0" diff --git a/meta-ohos-core/conf/distro/include/allscenarios.inc b/meta-ohos-core/conf/distro/include/allscenarios.inc index dbfa8d54..8e3a422b 100644 --- a/meta-ohos-core/conf/distro/include/allscenarios.inc +++ b/meta-ohos-core/conf/distro/include/allscenarios.inc @@ -3,3 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 INHERIT += "ohos-sanity" + +# With our layer setup we would add any bbappend found from our +# layers.conf. This means blueprint-specific appends would leak +# into the package in our main distribution. To avoid this we +# mask out the blueprint layers in the main distro and unmask +# them only the blueprint distributions. +BBMASK += "meta-ohos/meta-ohos-blueprints/" -- GitLab