From 6033e484ba16ba3dbffe099840b9d263efa721b1 Mon Sep 17 00:00:00 2001
From: Thierry Escande <thierry.escande@huawei.com>
Date: Fri, 24 Jun 2022 08:35:25 +0200
Subject: [PATCH] openharmony-standard: Add distro variable
 OPENHARMONY_VERSION_FULL

This change adds the variable OPENHARMONY_VERSION_FULL to the distro
configuration file. Its default value is set to OPENHARMONY_VERSION.

The idea is to keep the openharmony-standard recipe version number to
OPENHARMONY_VERSION (i.e. Major.minor) and have the variable
OPENHARMONY_VERSION_FULL indicating the patch version.

With the update of the OpenHarmony source repositories to v3.1.1, the
variable OPENHARMONY_VERSION_FULL is set to "3.1.1", through a new
DISTROOVERRIDES entry.

Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
---
 conf/distro/oniro-openharmony-linux.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conf/distro/oniro-openharmony-linux.conf b/conf/distro/oniro-openharmony-linux.conf
index be1493bb..cb429c6f 100644
--- a/conf/distro/oniro-openharmony-linux.conf
+++ b/conf/distro/oniro-openharmony-linux.conf
@@ -8,6 +8,11 @@ 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}"
 
 # LLVM/Clang toolchain
-- 
GitLab