From 255af99d2538fb07e5f6edf648cb9b146db5fed6 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Thu, 1 Dec 2022 15:55:44 +0000
Subject: [PATCH] Release v2.0.0
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
manifests/default.xml | 12 ++++++------
meta-oniro-core/conf/distro/oniro-freertos.conf | 2 +-
meta-oniro-core/conf/distro/oniro-linux.conf | 4 ++--
meta-oniro-core/conf/distro/oniro-zephyr.conf | 2 +-
scripts/upgrade_oniro/upgrade_oniro.py | 1 +
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/manifests/default.xml b/manifests/default.xml
index 9befdfea..c885cbaa 100644
--- a/manifests/default.xml
+++ b/manifests/default.xml
@@ -54,12 +54,12 @@ 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" 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/third-party/forks/meta-ledge-secure.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ledge-secure" />
- <project name="oniro-core/third-party/forks/meta-ts.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ts" />
- <project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" />
+ <project name="oniro-core/meta-clang.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-clang" />
+ <project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-zephyr" />
+ <project name="oniro-core/third-party/forks/meta-ledge-secure.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-ledge-secure" />
+ <project name="oniro-core/third-party/forks/meta-ts.git" remote="eclipse" revision="refs/tags/v2.0.0" path="meta-ts" />
+ <project name="oniro-core/docs.git" remote="eclipse" revision="refs/tags/v2.0.0" path="docs" />
</manifest>
diff --git a/meta-oniro-core/conf/distro/oniro-freertos.conf b/meta-oniro-core/conf/distro/oniro-freertos.conf
index d77ca139..0eedd28d 100644
--- a/meta-oniro-core/conf/distro/oniro-freertos.conf
+++ b/meta-oniro-core/conf/distro/oniro-freertos.conf
@@ -6,4 +6,4 @@ require conf/distro/freertos.conf
require conf/distro/include/oniro.inc
ONIRO_FLAVOUR_PRETTY = "FreeRTOS"
-DISTRO_VERSION = "2.0.0-beta"
+DISTRO_VERSION = "2.0.0"
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 9be326fa..7aaf9843 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -3,8 +3,8 @@
# SPDX-License-Identifier: MIT
ONIRO_FLAVOUR_PRETTY = "Linux"
-DISTRO_VERSION = "2.0.0-beta"
-DISTRO_CODENAME = "dev"
+DISTRO_VERSION = "2.0.0"
+DISTRO_CODENAME = "2.0.0"
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 661d1a22..de8381e6 100644
--- a/meta-oniro-core/conf/distro/oniro-zephyr.conf
+++ b/meta-oniro-core/conf/distro/oniro-zephyr.conf
@@ -6,4 +6,4 @@ require conf/distro/include/oniro.inc
require conf/distro/zephyr.conf
ONIRO_FLAVOUR_PRETTY = "Zephyr"
-DISTRO_VERSION = "2.0.0-beta"
+DISTRO_VERSION = "2.0.0"
diff --git a/scripts/upgrade_oniro/upgrade_oniro.py b/scripts/upgrade_oniro/upgrade_oniro.py
index 4149781a..9ebb6f9b 100755
--- a/scripts/upgrade_oniro/upgrade_oniro.py
+++ b/scripts/upgrade_oniro/upgrade_oniro.py
@@ -102,6 +102,7 @@ def init_script_options():
"v2.0.0-alpha",
"v2.0.0-alpha2",
"v2.0.0-beta",
+ "v2.0.0",
"kirkstone",
]
--
GitLab