From 6160ae3b31d645f4206164b55766a5c26bbc278f Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 18 Jul 2022 13:07:46 +0200
Subject: [PATCH] Change default OPENHARMONY_VERSION from 3.1 to 3.0
With current plan for OpenHarmony compatibility being focused on OpenHarmony
3.0.1, it makes most sense to have that as default version instead of 3.1(.1).
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
conf/distro/include/openharmony.inc | 2 +-
conf/local.conf.sample | 4 ++--
recipes-openharmony/sdk/README.rst | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/conf/distro/include/openharmony.inc b/conf/distro/include/openharmony.inc
index f5631e7c..3b3e36f9 100644
--- a/conf/distro/include/openharmony.inc
+++ b/conf/distro/include/openharmony.inc
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
# OpenHarmony OS version
-OPENHARMONY_VERSION ?= "3.1"
+OPENHARMONY_VERSION ?= "3.0"
OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}"
OPENHARMONY_VERSION_FULL:openharmony-3.0 = "3.0.1"
OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 0e337538..e53b7455 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -110,7 +110,7 @@ MIRRORS:prepend = "git://gitee.com/openharmony/ git://github.com/openharmony/ \n
#
# Choose OpenHarmony version
#
-# Uncomment to overwrite the variable OPENHARMONY_VERSION set in the
+# Uncomment to override the variable OPENHARMONY_VERSION set in the
# distro configuration file.
#
-#OPENHARMONY_VERSION = "3.0"
+#OPENHARMONY_VERSION = "3.1"
diff --git a/recipes-openharmony/sdk/README.rst b/recipes-openharmony/sdk/README.rst
index 287489ff..0e7aed65 100644
--- a/recipes-openharmony/sdk/README.rst
+++ b/recipes-openharmony/sdk/README.rst
@@ -35,17 +35,17 @@ OpenSource toolchain and third-party components with newer Oniro versions.
Building
********
-To build `oniro-openharmony-bundle` for OpenHarmony 3.1.1, the `bitbake` command
+To build `oniro-openharmony-bundle` for OpenHarmony 3.0.1, the `bitbake` command
is simply::
DISTRO=oniro-openharmony-linux MACHINE=qemuarma7 bitbake oniro-openharmony-bundle
-In order to build for OpenHarmony 3.0.1 instead, you need to add the following
+In order to build for OpenHarmony 3.1.1 instead, you need to add the following
line to the `build/conf/local.conf` file::
- OPENHARMONY_VERSION = "3.0"
+ OPENHARMONY_VERSION = "3.1"
-And then use the same command as shown above for 3.1.1.
+And then use the same command as shown above for 3.0.1.
To build `oniro-openharmony-toolchain` instead, simply use::
@@ -62,12 +62,12 @@ Warning! It is recommended to only install OpenHarmony prebuilts to clean
upstream OpenHarmony source repsitories, as the installation will remove files
and entire git repositories!
-To install the `oniro-openharmony-bundle` to a clean OpenHarmony 3.1.1
+To install the `oniro-openharmony-bundle` to a clean OpenHarmony 3.0.1
repository, you should do something like this::
- tar xfz $DOWNLOADS/code-v3.1.1-Release.tar.gz
- cd code-v3.1-Relase/OpenHarmony
- $DOWNLOADS/oniro-openharmony-bundle-3.1-cortexa7-neon-vfpv4-1.99.99.sh -y -d oniro
+ tar xfz $DOWNLOADS/code-v3.0.1-LTS.tar.gz
+ cd code-v3.0.1-LTS/OpenHarmony
+ $DOWNLOADS/oniro-openharmony-bundle-3.0-cortexa7-neon-vfpv4-1.99.99.sh -y -d oniro
./oniro/setup.sh
After this, you can use normal OpenHarmony build system procedures to build as
--
GitLab