From 9b5fffb74fa937ef0420b0a1574b7062cb9eb7cd Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Fri, 15 Oct 2021 15:20:26 +0100 Subject: [PATCH] manifests: Import XML files from manifests repository The repo manifests are currently in a separate repository. This became a burden in maintenence as meta-asos (oniro) has hard dependencies on it (for example bblayers configuration sample). This moves the manifests in the main oniro repository so we can handle repo manifests and build metadata changes atomically. The manifests repository is to be deprecated. The import of the manifest XML files is clean with the exeption of flattening the projects in sources. In other words, a project that used to be checked out in /sources/foo is not checked out in /foo. Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- manifests/default.xml | 75 +++++++++++++++++++++++++++++++++++++++++++ manifests/gitee.xml | 20 ++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 manifests/default.xml create mode 100644 manifests/gitee.xml diff --git a/manifests/default.xml b/manifests/default.xml new file mode 100644 index 00000000..1859d773 --- /dev/null +++ b/manifests/default.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +SPDX-License-Identifier: Apache-2.0 +SPDX-FileCopyrightText: Huawei Inc. +--> +<manifest> + <notice> + + Thank you for building development version of All Scenario OS. This + manifest file automatically follows changes in certain layers + and is suitable for development of All Scenario OS itself. + + Check out All Scenario OS documentation at https://allscenarios.readthedocs.org/ + + Meet the developers on mattermost at https://chat.ostc-eu.org/ + + </notice> + <remote name="github" fetch="https://github.com" /> + <remote name="ohos" fetch="https://git.ostc-eu.org/OSTC/OHOS" /> + <remote name="ohos-governance" fetch="https://git.ostc-eu.org/OSTC/OHOS/governance" /> + <remote name="yocto" fetch="git://git.yoctoproject.org" /> + <remote name="openembedded" fetch="git://git.openembedded.org" /> + <remote name="aehs29" fetch="https://github.com/aehs29" /> + <remote name="seco-intel" fetch="https://git.seco.com/pub/intel/yocto" /> + <remote name="seco-imx" fetch="https://git.seco.com/pub/i.mx/yocto/5.x" /> + <remote name="stm" fetch="https://github.com/STMicroelectronics" /> + <remote name="linaro" fetch="https://git.linaro.org/openembedded" /> + + <!-- + All Scenario OS build system is based on Yocto "dunfell" + (3.1 - see https://wiki.yoctoproject.org/wiki/Releases for more information). + Hence, the layers setup below uses corresponding "dunfell" layers or "dunfell" compatible revisions. + --> + + <default remote="ohos" revision="develop" sync-j="4" /> + <project name="poky" remote="yocto" revision="74b22db6879b388d700f61e08cb3f239cf940d18" path="poky" /> + <project name="meta-openembedded" remote="openembedded" revision="2e7e98cd0cb82db214b13224c71134b9335a719b" path="meta-openembedded" /> + <project name="meta-homeassistant/meta-homeassistant.git" remote="github" revision="7de873c320fb20414738ad02ee45fc0e3e4a1e0b" path="meta-homeassistant" /> + <project name="meta-freertos" remote="aehs29" revision="cdca1f2fffd99c00e3e471421ce485d3aaf99276" path="meta-freertos" /> + <project name="meta-st-stm32mp" remote="stm" revision="b25a2b0daa6e9e1e3ce76b9fdf5bd7cbf30e90fc" path="meta-st-stm32mp" /> + <project name="meta-st-stm32mp-addons" remote="stm" revision="81065195a63e98be8f423ab422960e9d7896f4d5" path="meta-st-stm32mp-addons" /> + + <project name="meta-intel" remote="yocto" revision="b4e5d33affeaa223459c0935a853485137b4591d" path="meta-intel" /> + <project name="meta-seco-intel" remote="seco-intel" revision="baf4cd3237bdf4f4999b7d44c6992dbcab93d5e3" path="meta-seco-intel" /> + + <project name="meta-freescale" remote="yocto" revision="11170950b155168ec414bbde48e3a4427fcac4bd" path="meta-freescale" /> + <project name="meta-seco-imx" remote="seco-imx" revision="b53f14e87f6de91933457095a0e04676690a9cdc" path="meta-seco-imx" /> + <project name="meta-av96" revision="a4b2b45efcbad1882227eac54b5023ff6b736b10" path="meta-av96" /> + <project name="meta-python-extra" revision="7bda3c1e5d6876375a8bf865ed9fcce2622c1715" path="meta-python-extra" /> + <project name="meta-raspberrypi" remote="yocto" revision="77190af02d48adc2b28216775e6318e9eeda571c" path="meta-raspberrypi" /> + <project name="meta-security" remote="yocto" revision="b76698c788cb8ca632077a972031899ef15025d6" path="meta-security" /> + <project name="meta-linaro" remote="linaro" revision="10af9133aeb28b3487fd227c900c11b786505699" path="meta-linaro" /> + <project name="rauc/meta-rauc.git" remote="github" revision="f528f95b75922eb81895d764836a67f13858365a" path="meta-rauc" /> + + <!-- + All entries above are pinned to a specific revision and updated manually. + + For the entries below this comment it depends on the phase of development + the project is in at the given time. In normal development mode it would be + "floating" entries, that follow branches and not precise revisions (this + can be identified by the missing revision="" tag). + + When the release process is entered these would be pinned as well. Most + likely to a git tag in the repository. If a revision="" tag is present + this is the case. + + --> + + <project name="meta-ohos" path="meta-ohos" /> + <project name="meta-clang" revision="main" path="meta-clang" /> + <project name="meta-riscv" revision="OSTC/dunfell" path="meta-riscv" /> + <project name="meta-zephyr" revision="ostc/master" path="meta-zephyr" /> + <project name="docs" path="docs" revision="main" /> + <project name="ip-policy" remote="ohos-governance" revision="main" path="ip-policy" /> +</manifest> diff --git a/manifests/gitee.xml b/manifests/gitee.xml new file mode 100644 index 00000000..55bd80fc --- /dev/null +++ b/manifests/gitee.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +SPDX-License-Identifier: Apache-2.0 +SPDX-FileCopyrightText: Huawei Inc. +--> +<manifest> + <include name="default.xml" /> + + <remote name="gitee-oniro" fetch="https://gitee.com/oniroproject/" /> + + <extend-project name="meta-ohos" remote="gitee-oniro" /> + <extend-project name="meta-zephyr" remote="gitee-oniro" /> + <extend-project name="meta-riscv" remote="gitee-oniro" /> + <extend-project name="meta-clang" remote="gitee-oniro" /> + <extend-project name="meta-python-extra" remote="gitee-oniro" /> + + <extend-project name="docs" remote="gitee-oniro" /> + <extend-project name="ip-policy" remote="gitee-oniro" /> +</manifest> + -- GitLab