Skip to content
Snippets Groups Projects
Verified Commit 8a4d1213 authored by Andrei Gherzan's avatar Andrei Gherzan :penguin:
Browse files

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's avatarAndrei Gherzan <andrei.gherzan@huawei.com>
parent e9b24089
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
# #
# SPDX-License-Identifier: Apache-2.0 # 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 require conf/distro/include/security_flags.inc
INHERIT += "oniro-sanity" INHERIT += "oniro-sanity"
......
...@@ -5,6 +5,5 @@ ...@@ -5,6 +5,5 @@
require conf/distro/freertos.conf require conf/distro/freertos.conf
require conf/distro/include/oniro.inc require conf/distro/include/oniro.inc
DISTRO = "oniro-freertos" ONIRO_FLAVOUR_PRETTY = "FreeRTOS"
DISTRO_NAME = "Oniro Project Base FreeRTOS Distro"
DISTRO_VERSION = "2.0.0-alpha" DISTRO_VERSION = "2.0.0-alpha"
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
DISTRO = "oniro-linux" ONIRO_FLAVOUR_PRETTY = "Linux"
DISTRO_NAME = "Oniro Project Base Linux Distro"
DISTRO_VERSION = "2.0.0-alpha" DISTRO_VERSION = "2.0.0-alpha"
DISTRO_CODENAME = "dev" DISTRO_CODENAME = "dev"
SDK_VENDOR = "-onirosdk" SDK_VENDOR = "-onirosdk"
......
...@@ -5,6 +5,5 @@ ...@@ -5,6 +5,5 @@
require conf/distro/include/oniro.inc require conf/distro/include/oniro.inc
require conf/distro/zephyr.conf require conf/distro/zephyr.conf
DISTRO = "oniro-zephyr" ONIRO_FLAVOUR_PRETTY = "Zephyr"
DISTRO_NAME = "Oniro Project Base Zephyr Distro"
DISTRO_VERSION = "2.0.0-alpha" DISTRO_VERSION = "2.0.0-alpha"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment