From 8a4d12135714e1c40731574cc941dbdf933f8ec2 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Thu, 18 Aug 2022 14:01:39 +0200
Subject: [PATCH] Introduce ONIRO_FLAVOUR/ONIRO_FLAVOUR_PRETTY
Each distro configurations are now defining DISTRO and DISTRO_NAME based
on ONIRO_FLAVOUR (which in turn is autogenerated from
ONIRO_FLAVOUR_PRETTY). This reduces duplication but also allows to check
for the flavour at build time via querying ONIRO_FLAVOUR.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-oniro-core/conf/distro/include/oniro.inc | 4 ++++
meta-oniro-core/conf/distro/oniro-freertos.conf | 3 +--
meta-oniro-core/conf/distro/oniro-linux.conf | 3 +--
meta-oniro-core/conf/distro/oniro-zephyr.conf | 3 +--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc
index 1f50269d..66c8074c 100644
--- a/meta-oniro-core/conf/distro/include/oniro.inc
+++ b/meta-oniro-core/conf/distro/include/oniro.inc
@@ -2,6 +2,10 @@
#
# SPDX-License-Identifier: Apache-2.0
+ONIRO_FLAVOUR = "${@'${ONIRO_FLAVOUR_PRETTY}'.lower()}"
+DISTRO = "oniro-${ONIRO_FLAVOUR}"
+DISTRO_NAME = "Oniro Project Base ${ONIRO_FLAVOUR} Distro"
+
require conf/distro/include/security_flags.inc
INHERIT += "oniro-sanity"
diff --git a/meta-oniro-core/conf/distro/oniro-freertos.conf b/meta-oniro-core/conf/distro/oniro-freertos.conf
index 9421ed3e..6ec72abd 100644
--- a/meta-oniro-core/conf/distro/oniro-freertos.conf
+++ b/meta-oniro-core/conf/distro/oniro-freertos.conf
@@ -5,6 +5,5 @@
require conf/distro/freertos.conf
require conf/distro/include/oniro.inc
-DISTRO = "oniro-freertos"
-DISTRO_NAME = "Oniro Project Base FreeRTOS Distro"
+ONIRO_FLAVOUR_PRETTY = "FreeRTOS"
DISTRO_VERSION = "2.0.0-alpha"
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index dba12a36..1667d080 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -2,8 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-DISTRO = "oniro-linux"
-DISTRO_NAME = "Oniro Project Base Linux Distro"
+ONIRO_FLAVOUR_PRETTY = "Linux"
DISTRO_VERSION = "2.0.0-alpha"
DISTRO_CODENAME = "dev"
SDK_VENDOR = "-onirosdk"
diff --git a/meta-oniro-core/conf/distro/oniro-zephyr.conf b/meta-oniro-core/conf/distro/oniro-zephyr.conf
index 88c8a299..a1592490 100644
--- a/meta-oniro-core/conf/distro/oniro-zephyr.conf
+++ b/meta-oniro-core/conf/distro/oniro-zephyr.conf
@@ -5,6 +5,5 @@
require conf/distro/include/oniro.inc
require conf/distro/zephyr.conf
-DISTRO = "oniro-zephyr"
-DISTRO_NAME = "Oniro Project Base Zephyr Distro"
+ONIRO_FLAVOUR_PRETTY = "Zephyr"
DISTRO_VERSION = "2.0.0-alpha"
--
GitLab