From 3693cae285c9aca08b756d9436d1b58887a7ef9a Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Mon, 6 Jun 2022 17:03:20 +0200
Subject: [PATCH] Bump release to version 2.0.0-alpha
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
docs/conf.py | 4 ++--
manifests/default.xml | 8 ++++----
meta-oniro-core/conf/distro/oniro-freertos.conf | 2 +-
meta-oniro-core/conf/distro/oniro-linux.conf | 2 +-
meta-oniro-core/conf/distro/oniro-zephyr.conf | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 26f03363..35907890 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 469a18d8..55dddc88 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 64cf56a8..c81f5519 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 d6e83d7d..667b1494 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 3bc8789e..88c8a299 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"
--
GitLab