From f7727036da61d04d3d3737a1cd3472291a1159b3 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Sun, 19 Dec 2021 20:25:20 +0100
Subject: [PATCH] Bump release to version 1.0.0-rc2
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
docs/conf.py | 2 +-
manifests/default.xml | 6 +++---
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, 7 insertions(+), 7 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 6e1d8362..55d85bf4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,7 +25,7 @@ project = 'Oniro Project Build System'
copyright = '2021'
author = 'Oniro Project'
-version = '1.0.0-rc'
+version = '1.0.0-rc2'
release = version
# -- General configuration ---------------------------------------------------
diff --git a/manifests/default.xml b/manifests/default.xml
index 68ec5569..913964af 100644
--- a/manifests/default.xml
+++ b/manifests/default.xml
@@ -71,7 +71,7 @@ SPDX-FileCopyrightText: Huawei Inc.
-->
- <project name="oniro" revision="releases/v1.0.0" path="oniro">
+ <project name="oniro" revision="refs/tags/v1.0.0-rc2" path="oniro">
<linkfile src="README.md" dest="README.md"/>
</project>
<project name="meta-arm-dunfell-backports" revision="7902cf4ce402e52a3a939b4b50b4905193c943ed" path="meta-arm-mixin" />
@@ -79,6 +79,6 @@ SPDX-FileCopyrightText: Huawei Inc.
<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-rc" />
- <project name="ip-policy" remote="oniro-governance" revision="refs/tags/v1.0.0-rc" path="ip-policy" />
+ <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" />
</manifest>
diff --git a/meta-oniro-core/conf/distro/oniro-freertos.conf b/meta-oniro-core/conf/distro/oniro-freertos.conf
index 9d922286..22fb0dd4 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.0.0-rc"
+DISTRO_VERSION = "1.0.0-rc2"
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 6110d974..ef422c31 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.0.0-rc"
+DISTRO_VERSION = "1.0.0-rc2"
DISTRO_CODENAME = "dunfell"
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 1d76f98e..0e849e39 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.0.0-rc"
+DISTRO_VERSION = "1.0.0-rc2"
--
GitLab