From 462af3d7afbae7caaef0e57450b2f5ee3d57bcd1 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 27 Jun 2022 08:39:37 +0200
Subject: [PATCH] oniro-openharmony-linux.conf: Prepare use with other distros
This makes it easier to use of meta-openharmony in projects that does not use
oniro-openharmony-linux distro configuration.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
conf/distro/include/openharmony.inc | 11 +++++++++++
conf/distro/oniro-openharmony-linux.conf | 9 ++-------
2 files changed, 13 insertions(+), 7 deletions(-)
create mode 100644 conf/distro/include/openharmony.inc
diff --git a/conf/distro/include/openharmony.inc b/conf/distro/include/openharmony.inc
new file mode 100644
index 00000000..a519e5b1
--- /dev/null
+++ b/conf/distro/include/openharmony.inc
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# OpenHarmony OS version
+OPENHARMONY_VERSION ?= "3.1"
+OPENHARMONY_OVERRIDES = "openharmony-${OPENHARMONY_VERSION}"
+OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}"
+OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1"
+
+PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}"
diff --git a/conf/distro/oniro-openharmony-linux.conf b/conf/distro/oniro-openharmony-linux.conf
index 7036ac9a..d75f9c54 100644
--- a/conf/distro/oniro-openharmony-linux.conf
+++ b/conf/distro/oniro-openharmony-linux.conf
@@ -7,13 +7,8 @@ DISTRO_NAME = "Oniro/OpenHarmony Linux Distro"
DISTRO_VERSION = "1.99.99"
# OpenHarmony OS version
-OPENHARMONY_VERSION ?= "3.1"
-
-DISTROOVERRIDES:append = ":openharmony-${OPENHARMONY_VERSION}"
-OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}"
-OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1"
-
-PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}"
+require include/openharmony.inc
+DISTROOVERRIDES:append = ":${OPENHARMONY_OVERRIDES}"
# LLVM/Clang toolchain
TOOLCHAIN = "clang"
--
GitLab