From 2e108bc2d3db9ef769e3f51546f601c68fbccf29 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Fri, 8 Oct 2021 16:32:34 +0200
Subject: [PATCH] distros: Project rename in long format DISTRO_NAME

This commit still keeps the internal DISTRO variable name as-is and only
changes the longer free form version.

Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
 .../conf/distro/allscenarios-linux-blueprint-dashboard.conf     | 2 +-
 .../conf/distro/allscenarios-linux-blueprint-gateway.conf       | 2 +-
 .../distro/allscenarios-linux-blueprint-vending-machine.conf    | 2 +-
 .../conf/distro/allscenarios-zephyr-blueprint-dashboard.conf    | 2 +-
 meta-ohos-core/conf/distro/allscenarios-linux.conf              | 2 +-
 meta-ohos-core/conf/distro/allscenarios-zephyr.conf             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
index ae0eae20..9d822514 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
@@ -10,7 +10,7 @@ include conf/distro/include/ha-versions.inc
 PREFERRED_VERSION_python3-pymetno = "0.7.0"
 
 DISTRO = "allscenarios-linux-blueprint-dashboard"
-DISTRO_NAME = "AllScenariOS Dashboard Blueprint Linux Distro"
+DISTRO_NAME = "Oniro Project Dashboard Blueprint Linux Distro"
 
 # Custom hostnames for easy DNS resolution for this blueprint.
 # The gateway would run on a stm32mp1-av96 machine.
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
index 6d30c185..baaf32e4 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
@@ -7,7 +7,7 @@
 require conf/distro/allscenarios-linux.conf
 
 DISTRO = "allscenarios-linux-blueprint-gateway"
-DISTRO_NAME = "All Scenarios OS Gateway Blueprint Linux Distro"
+DISTRO_NAME = "Oniro Project Gateway Blueprint Linux Distro"
 
 # Custom hostnames for easy DNS resolution for this blueprint.
 hostname_base-files = "blueprint-gateway"
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf
index 8eb914e3..6ba5d248 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf
@@ -7,7 +7,7 @@
 require conf/distro/allscenarios-linux.conf
 
 DISTRO = "allscenarios-linux-blueprint-vending-machine"
-DISTRO_NAME = "AllScenariOS Vending-Machine Blueprint Linux Distro"
+DISTRO_NAME = "Oniro Project Vending-Machine Blueprint Linux Distro"
 
 # With our layer setup we would add any bbappend found from our
 # layers.conf. This means blueprint-specific appends would leak
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf
index ff2dfc55..39009eb5 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf
@@ -7,7 +7,7 @@
 require conf/distro/allscenarios-zephyr.conf
 
 DISTRO = "allscenarios-zephyr-blueprint-dashboard"
-DISTRO_NAME = "AllScenariOS Dashboard Blueprint Zephyr Distro"
+DISTRO_NAME = "Oniro Project Dashboard Blueprint Zephyr Distro"
 
 # With our layer setup we would add any bbappend found from our
 # layers.conf. This means blueprint-specific appends would leak
diff --git a/meta-ohos-core/conf/distro/allscenarios-linux.conf b/meta-ohos-core/conf/distro/allscenarios-linux.conf
index 15f17b78..3475c5c3 100644
--- a/meta-ohos-core/conf/distro/allscenarios-linux.conf
+++ b/meta-ohos-core/conf/distro/allscenarios-linux.conf
@@ -7,7 +7,7 @@ require conf/distro/include/oniro-wic.inc
 require conf/distro/poky.conf
 
 DISTRO = "allscenarios-linux"
-DISTRO_NAME = "AllScenariOS Base Linux Distro"
+DISTRO_NAME = "Oniro Project Base Linux Distro"
 DISTRO_VERSION = "1.0.0-beta"
 
 TCLIBC ?= "musl"
diff --git a/meta-ohos-core/conf/distro/allscenarios-zephyr.conf b/meta-ohos-core/conf/distro/allscenarios-zephyr.conf
index cac847e3..628d6a56 100644
--- a/meta-ohos-core/conf/distro/allscenarios-zephyr.conf
+++ b/meta-ohos-core/conf/distro/allscenarios-zephyr.conf
@@ -6,5 +6,5 @@ require conf/distro/include/allscenarios.inc
 require conf/distro/zephyr.conf
 
 DISTRO = "allscenarios-zephyr"
-DISTRO_NAME = "AllScenariOS Base Zephyr Distro"
+DISTRO_NAME = "Oniro Project Base Zephyr Distro"
 DISTRO_VERSION = "1.0.0-beta"
-- 
GitLab