From 7a8123f16481b062aeb7e4fa59599fd454a331c7 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Wed, 27 Apr 2022 11:59:16 +0200 Subject: [PATCH] Bring back meta-arm in oniro builds Before updating to kirkstone, we had work in progress support for qemu-generic-arm64. This requires meta-arm layer. With the kirkstone update, this layer was dropped. Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- flavours/linux/bblayers.conf.sample | 2 ++ manifests/default.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/flavours/linux/bblayers.conf.sample b/flavours/linux/bblayers.conf.sample index 2d67a9e7..e38fd1aa 100644 --- a/flavours/linux/bblayers.conf.sample +++ b/flavours/linux/bblayers.conf.sample @@ -12,6 +12,8 @@ BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/../oniro/meta-oniro-staging \ ##OEROOT##/meta \ + ##OEROOT##/../meta-arm/meta-arm \ + ##OEROOT##/../meta-arm/meta-arm-toolchain \ ##OEROOT##/../meta-clang \ ##OEROOT##/../meta-zephyr/meta-zephyr-bsp \ ##OEROOT##/../meta-zephyr/meta-zephyr-core \ diff --git a/manifests/default.xml b/manifests/default.xml index 77cad75a..febf4058 100644 --- a/manifests/default.xml +++ b/manifests/default.xml @@ -35,6 +35,7 @@ SPDX-FileCopyrightText: Huawei Inc. <project name="meta-security" remote="yocto" revision="93f2146211001ee3cf697d8428969cc3069ed6ba" path="meta-security" /> <project name="rauc/meta-rauc" remote="github" revision="4429bd1f29677c9a7de032d53240fb4791a41e1f" path="meta-rauc" /> <project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" /> + <project name="meta-arm" remote="yocto" revision="c713908b7feb31067601e335222725e5ddcb6668" path="meta-arm" /> <!-- All entries above are pinned to a specific revision and updated manually. -- GitLab