From 47de5ca19dc38bf52b075cfed3828829720f502f Mon Sep 17 00:00:00 2001 From: Philippe Coval <philippe.coval.ext@huawei.com> Date: Wed, 8 Jun 2022 14:29:43 +0200 Subject: [PATCH] repo: Rebase on kristone branch (goofy manifest) Use oniro as base Last-update: 2022-05-08 Signed-off-by: Philippe Coval <philippe.coval.ext@huawei.com> --- README | 4 +-- default.xml | 82 ++++++++++++++++++----------------------------------- 2 files changed, 29 insertions(+), 57 deletions(-) diff --git a/README b/README index b26497a..ff4500e 100644 --- a/README +++ b/README @@ -10,10 +10,10 @@ Dependencies ============ URI: https://booting.oniroproject.org/distro/oniro - branch: dunfell + branch: kirkstone URI: https://github.com/meta-flutter/meta-flutter - branch: dunfell + branch: kirkstone Patches ======= diff --git a/default.xml b/default.xml index 005d4e1..d49cd0e 100644 --- a/default.xml +++ b/default.xml @@ -15,74 +15,46 @@ SPDX-FileCopyrightText: Huawei Inc. Meet the developers on mattermost at https://chat.booting.oniroproject.org/ </notice> + + <remote name="eclipse" fetch="https://gitlab.eclipse.org/eclipse" /> <remote name="github" fetch="https://github.com" /> - <remote name="oniro" fetch="https://booting.oniroproject.org/distro" /> - <remote name="oniro-governance" fetch="https://booting.oniroproject.org/distro/governance" /> + <remote name="oniro-booting" fetch="https://booting.oniroproject.org" /> <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="seco-rockchip" fetch="https://git.seco.com/pub/rockchip" /> - <remote name="stm" fetch="https://github.com/STMicroelectronics" /> - <remote name="linaro" fetch="https://git.linaro.org/openembedded" /> - <remote name="oe" fetch="git://git.openembedded.org" /> - - <!-- - Oniro Project 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="oniro" revision="dunfell" sync-j="4" /> - <!-- - dunfell is using the 1.46 bitbake branch so the bitbake project follow is following this branch. - More info can be found at https://wiki.yoctoproject.org/wiki/Releases. - --> - <project name="bitbake" remote="oe" revision="f1a3e9d22b5f4fb01c4a0e4ba03afb1afbba47f1" path="bitbake" /> - <project name="openembedded-core" remote="oe" revision="90a07178ea26be453d101c2e8b33d3a0f437635d" path="oe-core" /> - <project name="meta-openembedded" remote="openembedded" revision="7889158dcd187546fc5e99fd81d0779cad3e8d17" path="meta-openembedded" /> - <project name="meta-freertos" remote="aehs29" revision="f3c2edb0f22c34b35a775c5d17ea1424d44bee21" 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="dunfell" path="meta-seco-imx" /> - <project name="meta-seco-rockchip" remote="seco-rockchip" revision="dunfell" path="meta-seco-rockchip" /> - <project name="meta-av96" revision="a4b2b45efcbad1882227eac54b5023ff6b736b10" path="meta-av96" /> - <project name="meta-python-mixin" revision="7bda3c1e5d6876375a8bf865ed9fcce2622c1715" path="meta-python-mixin" /> - <project name="meta-raspberrypi" remote="yocto" revision="934064a01903b2ba9a82be93b3f0efdb4543a0e8" 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" /> + <remote name="seco" fetch="https://git.seco.com" /> + + <project name="bitbake" remote="openembedded" revision="494fcfcb7c4469915c67f544997104d81c417266" path="bitbake" /> + <project name="openembedded-core" remote="openembedded" revision="4eb0b7468383a1d0314b3bfd43ea37c95de464d9" path="oe-core" /> + <project name="meta-openembedded" remote="openembedded" revision="5357c7a40eaf8d1bcf7ff58edbba8e9527e40c7d" path="meta-openembedded" /> + <project name="aehs29/meta-freertos" remote="github" revision="98a6838261d36b8f79c5fbae1736492169727a1e" path="meta-freertos" /> + <project name="meta-intel" remote="yocto" revision="fb23bc3e661685383edd3026e21ca25825c48bc4" path="meta-intel" /> + <project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" /> + <project name="meta-freescale" remote="yocto" revision="6f27a6fb2511bc1ac206efe8196f6e73b33b1dce" path="meta-freescale" /> + <project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="b82eaf8b0a2abe775c158b0a069b7bb7894ec8e6" path="meta-seco-imx" /> + <project name="meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" path="meta-raspberrypi" /> + <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="b838d40efe06c839d58cf39b785175d0ba7518c6" path="meta-arm" /> <!-- 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). + "floating" entries, that follow branches and not precise revisions. 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. - + likely to a git tag in the repository. --> - <project name="oniro" revision="refs/tags/v1.0.0-rc2" path="oniro"> + <project name="oniro-core/oniro.git" remote="eclipse" revision="kirkstone" path="oniro"> <linkfile src="README.md" dest="README.md"/> </project> - <project name="meta-arm-dunfell-backports" revision="7902cf4ce402e52a3a939b4b50b4905193c943ed" path="meta-arm-mixin" /> - <project name="meta-clang" revision="60891c293886c70f85a5c595315402609222d935" path="meta-clang" /> - <project name="meta-riscv" revision="98124ed494e714e50f1281517199a73b120a34bc" path="meta-riscv" /> - <project name="meta-zephyr" revision="99c895c2d0363fb7c829b1a3712e54015ea61660" path="meta-zephyr" /> - <project name="meta-zephyr-bsp" revision="fb4553c8ff27334683fad73a62573d325d55298b" path="meta-zephyr-bsp" /> - <project name="docs" path="docs" revision="refs/tags/v1.0.0-rc2" /> - <project name="ip-policy" remote="oniro-governance" revision="refs/tags/v1.0.0-rc2" path="ip-policy" /> - <project name="meta-flutter/meta-flutter" remote="github" revision="10e3635bed4fcec8b85770838e6469cb8e6ece57" path="meta-flutter" /> - <project name="ndechesne/meta-qcom" remote="github" revision="6d06c9ea9a9488ad2ea0a566ed012039ec557cbc" path="meta-qcom" /> + <project name="oniro-core/meta-clang.git" remote="eclipse" revision="oniro/kirkstone" path="meta-clang" /> + <project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="oniro/kirkstone" path="meta-zephyr" /> + <project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" /> + <project name="distro/governance/ip-policy" remote="oniro-booting" revision="main" path="ip-policy" /> + <project name="meta-flutter/meta-flutter" remote="github" revision="kirkstone" path="meta-flutter" /> + <project name="ndechesne/meta-qcom" remote="github" revision="master" path="meta-qcom" /> </manifest> -- GitLab