From caffe8717d7cecf825f1fa3b0590ec404507cf32 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Fri, 15 Oct 2021 20:20:11 +0100 Subject: [PATCH] oniro.inc: Add temporary fix for meta-freertos meta-poky-bsp dependency Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- meta-oniro-core/conf/distro/include/oniro.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc index 2ee631af..e67d9f3c 100644 --- a/meta-oniro-core/conf/distro/include/oniro.inc +++ b/meta-oniro-core/conf/distro/include/oniro.inc @@ -10,3 +10,13 @@ INHERIT += "oniro-sanity" # mask out the blueprint layers in the main distro and unmask # them only the blueprint distributions. BBMASK += "meta-ohos/meta-ohos-blueprints/" + +# This is the ugliest fix possible but it fixes the build while keeping +# meta-freertos around. meta-freertos is pulling in a dependency on +# meta-poky-bsp without a reason that we can put a finger on and given that we +# have moved to oe-core/bitbake, bringing back poky just for this, makes little +# sense. We will follow up with upstream and do either of the following: +# * fix this properly upstream +# * drop freertos support +# * bring back poky once we clarify this dependency with the maintainer +LAYERDEPENDS_meta-freertos_remove = "yoctobsp" -- GitLab