diff --git a/docs/conf.py b/docs/conf.py index 26f03363c4edd3efe719e9f43bb57f467fd5c9d9..3590789005cc1cb8dfb80a440c415d67a6576397 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,10 +22,10 @@ # -- Project information ----------------------------------------------------- project = 'Oniro Project Build System' -copyright = '2021' +copyright = '2022' author = 'Oniro Project' -version = '1.99.99' +version = '2.0.0-alpha' release = version # -- General configuration --------------------------------------------------- diff --git a/manifests/default.xml b/manifests/default.xml index 469a18d82b8031248521ae8b63fdf1d62daab38a..55dddc8819b8f34f569cf8fe9f47f7b9eb83705a 100644 --- a/manifests/default.xml +++ b/manifests/default.xml @@ -48,11 +48,11 @@ SPDX-FileCopyrightText: Huawei Inc. likely to a git tag in the repository. --> - <project name="oniro-core/oniro.git" remote="eclipse" revision="kirkstone" path="oniro"> + <project name="oniro-core/oniro.git" remote="eclipse" revision="refs/tags/v2.0.0-alpha" path="oniro"> <linkfile src="README.md" dest="README.md"/> </project> - <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="oniro-core/meta-clang.git" remote="eclipse" revision="61bc6944e0962b45431d3f400ce5e0e15b85a03c" path="meta-clang" /> + <project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="df59d82772fd67b8fc1d30d97917305be0f49675" path="meta-zephyr" /> + <project name="oniro-core/docs.git" remote="eclipse" revision="refs/tags/v2.0.0-alpha" path="docs" /> <project name="distro/governance/ip-policy" remote="oniro-booting" revision="main" path="ip-policy" /> </manifest> diff --git a/meta-oniro-core/conf/distro/oniro-freertos.conf b/meta-oniro-core/conf/distro/oniro-freertos.conf index 64cf56a841b905eace81f2f59bdbca5a06f06327..c81f55198f3544fd05ece1a0a2777df388db201c 100644 --- a/meta-oniro-core/conf/distro/oniro-freertos.conf +++ b/meta-oniro-core/conf/distro/oniro-freertos.conf @@ -7,4 +7,4 @@ require conf/distro/freertos.conf DISTRO = "oniro-freertos" DISTRO_NAME = "Oniro Project Base FreeRTOS Distro" -DISTRO_VERSION = "1.99.99" +DISTRO_VERSION = "2.0.0-alpha" diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index d6e83d7d9b04c0afda9b5e7af4598dc933e93b30..667b1494938e73f8ed933d2dc427bdc6badf9a1e 100644 --- a/meta-oniro-core/conf/distro/oniro-linux.conf +++ b/meta-oniro-core/conf/distro/oniro-linux.conf @@ -4,7 +4,7 @@ DISTRO = "oniro-linux" DISTRO_NAME = "Oniro Project Base Linux Distro" -DISTRO_VERSION = "1.99.99" +DISTRO_VERSION = "2.0.0-alpha" DISTRO_CODENAME = "dev" SDK_VENDOR = "-onirosdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" diff --git a/meta-oniro-core/conf/distro/oniro-zephyr.conf b/meta-oniro-core/conf/distro/oniro-zephyr.conf index 3bc8789ec451effec67b06033f84f4dd72fa25c2..88c8a2999babd91e8f1336f39261374fa15980aa 100644 --- a/meta-oniro-core/conf/distro/oniro-zephyr.conf +++ b/meta-oniro-core/conf/distro/oniro-zephyr.conf @@ -7,4 +7,4 @@ require conf/distro/zephyr.conf DISTRO = "oniro-zephyr" DISTRO_NAME = "Oniro Project Base Zephyr Distro" -DISTRO_VERSION = "1.99.99" +DISTRO_VERSION = "2.0.0-alpha"