From 204e36603e4aa908ca99d26d73f5e09001413f88 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Mon, 29 Nov 2021 17:01:57 +0100
Subject: [PATCH] Bump release to version 1.0.0-rc
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
docs/conf.py | 2 +-
manifests/default.xml | 16 ++++++++--------
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, 12 insertions(+), 12 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index d5964eff..6e1d8362 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-beta'
+version = '1.0.0-rc'
release = version
# -- General configuration ---------------------------------------------------
diff --git a/manifests/default.xml b/manifests/default.xml
index 33af03cb..8008e48c 100644
--- a/manifests/default.xml
+++ b/manifests/default.xml
@@ -71,14 +71,14 @@ SPDX-FileCopyrightText: Huawei Inc.
-->
- <project name="oniro" revision="dunfell" path="oniro">
+ <project name="oniro" revision="refs/tags/v1.0.0-rc" path="oniro">
<linkfile src="README.md" dest="README.md"/>
</project>
- <project name="meta-arm-dunfell-backports" revision="dunfell" path="meta-arm-mixin" />
- <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="meta-zephyr-bsp" revision="dunfell" path="meta-zephyr-bsp" />
- <project name="docs" path="docs" revision="main" />
- <project name="ip-policy" remote="oniro-governance" revision="main" path="ip-policy" />
+ <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-rc" />
+ <project name="ip-policy" remote="oniro-governance" revision="refs/tags/v1.0.0-rc" 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 4f1a69fd..9d922286 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-beta"
+DISTRO_VERSION = "1.0.0-rc"
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index aac51d3d..6110d974 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-beta"
+DISTRO_VERSION = "1.0.0-rc"
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 8f58e51b..1d76f98e 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-beta"
+DISTRO_VERSION = "1.0.0-rc"
--
GitLab