From f188932e665c76ea2c98eb33035d70f75ac7deaa Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Fri, 8 Oct 2021 17:16:55 +0200
Subject: [PATCH] distros: Project rename
Change prefix for all DISTRO values as well as moving the distro config
files and includes. This needs to go together with the .ostc-ci change
to change our CI jobs for the new names.
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
flavours/linux/local.conf.sample | 2 +-
flavours/zephyr/local.conf.sample | 2 +-
...-dashboard.conf => oniro-linux-blueprint-dashboard.conf} | 4 ++--
...rint-gateway.conf => oniro-linux-blueprint-gateway.conf} | 4 ++--
...hine.conf => oniro-linux-blueprint-vending-machine.conf} | 4 ++--
...-demo-dashboard.conf => oniro-linux-demo-dashboard.conf} | 6 +++---
...dashboard.conf => oniro-zephyr-blueprint-dashboard.conf} | 4 ++--
.../conf/distro/include/{allscenarios.inc => oniro.inc} | 0
.../distro/{allscenarios-linux.conf => oniro-linux.conf} | 4 ++--
.../distro/{allscenarios-zephyr.conf => oniro-zephyr.conf} | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
rename meta-ohos-blueprints/conf/distro/{allscenarios-linux-blueprint-dashboard.conf => oniro-linux-blueprint-dashboard.conf} (94%)
rename meta-ohos-blueprints/conf/distro/{allscenarios-linux-blueprint-gateway.conf => oniro-linux-blueprint-gateway.conf} (92%)
rename meta-ohos-blueprints/conf/distro/{allscenarios-linux-blueprint-vending-machine.conf => oniro-linux-blueprint-vending-machine.conf} (83%)
rename meta-ohos-blueprints/conf/distro/{allscenarios-linux-demo-dashboard.conf => oniro-linux-demo-dashboard.conf} (56%)
rename meta-ohos-blueprints/conf/distro/{allscenarios-zephyr-blueprint-dashboard.conf => oniro-zephyr-blueprint-dashboard.conf} (87%)
rename meta-ohos-core/conf/distro/include/{allscenarios.inc => oniro.inc} (100%)
rename meta-ohos-core/conf/distro/{allscenarios-linux.conf => oniro-linux.conf} (94%)
rename meta-ohos-core/conf/distro/{allscenarios-zephyr.conf => oniro-zephyr.conf} (71%)
diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample
index 09bd77f7..4af9c3bc 100644
--- a/flavours/linux/local.conf.sample
+++ b/flavours/linux/local.conf.sample
@@ -74,7 +74,7 @@ MACHINE ??= "qemux86-64"
#
# Default policy config
#
-DISTRO ?= "allscenarios-linux"
+DISTRO ?= "oniro-linux"
#
# Package Management configuration
diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample
index dd2834be..9af9a98e 100644
--- a/flavours/zephyr/local.conf.sample
+++ b/flavours/zephyr/local.conf.sample
@@ -78,7 +78,7 @@ MACHINE ??= "qemu-x86"
#
# Default policy config
#
-DISTRO ?= "allscenarios-zephyr"
+DISTRO ?= "oniro-zephyr"
#
# Package Management configuration
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf
similarity index 94%
rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
rename to meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf
index 9d822514..d1eb8ec6 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf
@@ -4,12 +4,12 @@
# Distro configuration for the dashboard blueprint
-require conf/distro/allscenarios-linux.conf
+require conf/distro/oniro-linux.conf
include conf/distro/include/ha-versions.inc
PREFERRED_VERSION_python3-pymetno = "0.7.0"
-DISTRO = "allscenarios-linux-blueprint-dashboard"
+DISTRO = "oniro-linux-blueprint-dashboard"
DISTRO_NAME = "Oniro Project Dashboard Blueprint Linux Distro"
# Custom hostnames for easy DNS resolution for this blueprint.
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
similarity index 92%
rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
rename to meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
index baaf32e4..716e4e00 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
+++ b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
@@ -4,9 +4,9 @@
# Distro configuration for the dashboard blueprint
-require conf/distro/allscenarios-linux.conf
+require conf/distro/oniro-linux.conf
-DISTRO = "allscenarios-linux-blueprint-gateway"
+DISTRO = "oniro-linux-blueprint-gateway"
DISTRO_NAME = "Oniro Project Gateway Blueprint Linux Distro"
# Custom hostnames for easy DNS resolution for this blueprint.
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf
similarity index 83%
rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf
rename to meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf
index 6ba5d248..6ebb8c5b 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-vending-machine.conf
+++ b/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf
@@ -4,9 +4,9 @@
# Distro configuration for the vending-machine blueprint
-require conf/distro/allscenarios-linux.conf
+require conf/distro/oniro-linux.conf
-DISTRO = "allscenarios-linux-blueprint-vending-machine"
+DISTRO = "oniro-linux-blueprint-vending-machine"
DISTRO_NAME = "Oniro Project Vending-Machine Blueprint Linux Distro"
# With our layer setup we would add any bbappend found from our
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf b/meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf
similarity index 56%
rename from meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf
rename to meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf
index e178c7fa..021266b3 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf
@@ -3,9 +3,9 @@
# SPDX-License-Identifier: Apache-2.0
# Deprecated distro configuration in favour of
-# allscenarios-linux-blueprint-dashboard
+# oniro-linux-blueprint-dashboard
-require conf/distro/allscenarios-linux-blueprint-dashboard.conf
+require conf/distro/oniro-linux-blueprint-dashboard.conf
# We keep the old distro name to sanity check this deprecation.
-DISTRO = "allscenarios-linux-demo-dashboard"
+DISTRO = "oniro-linux-demo-dashboard"
diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf
similarity index 87%
rename from meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf
rename to meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf
index 39009eb5..ab4b367f 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-zephyr-blueprint-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf
@@ -4,9 +4,9 @@
# Distro configuration for the dashboard blueprint
-require conf/distro/allscenarios-zephyr.conf
+require conf/distro/oniro-zephyr.conf
-DISTRO = "allscenarios-zephyr-blueprint-dashboard"
+DISTRO = "oniro-zephyr-blueprint-dashboard"
DISTRO_NAME = "Oniro Project Dashboard Blueprint Zephyr Distro"
# With our layer setup we would add any bbappend found from our
diff --git a/meta-ohos-core/conf/distro/include/allscenarios.inc b/meta-ohos-core/conf/distro/include/oniro.inc
similarity index 100%
rename from meta-ohos-core/conf/distro/include/allscenarios.inc
rename to meta-ohos-core/conf/distro/include/oniro.inc
diff --git a/meta-ohos-core/conf/distro/allscenarios-linux.conf b/meta-ohos-core/conf/distro/oniro-linux.conf
similarity index 94%
rename from meta-ohos-core/conf/distro/allscenarios-linux.conf
rename to meta-ohos-core/conf/distro/oniro-linux.conf
index ce8f43e8..ba597f20 100644
--- a/meta-ohos-core/conf/distro/allscenarios-linux.conf
+++ b/meta-ohos-core/conf/distro/oniro-linux.conf
@@ -2,11 +2,11 @@
#
# SPDX-License-Identifier: Apache-2.0
-require conf/distro/include/allscenarios.inc
+require conf/distro/include/oniro.inc
require conf/distro/include/oniro-wic.inc
require conf/distro/poky.conf
-DISTRO = "allscenarios-linux"
+DISTRO = "oniro-linux"
DISTRO_NAME = "Oniro Project Base Linux Distro"
DISTRO_VERSION = "1.0.0-beta"
diff --git a/meta-ohos-core/conf/distro/allscenarios-zephyr.conf b/meta-ohos-core/conf/distro/oniro-zephyr.conf
similarity index 71%
rename from meta-ohos-core/conf/distro/allscenarios-zephyr.conf
rename to meta-ohos-core/conf/distro/oniro-zephyr.conf
index 628d6a56..8f58e51b 100644
--- a/meta-ohos-core/conf/distro/allscenarios-zephyr.conf
+++ b/meta-ohos-core/conf/distro/oniro-zephyr.conf
@@ -2,9 +2,9 @@
#
# SPDX-License-Identifier: Apache-2.0
-require conf/distro/include/allscenarios.inc
+require conf/distro/include/oniro.inc
require conf/distro/zephyr.conf
-DISTRO = "allscenarios-zephyr"
+DISTRO = "oniro-zephyr"
DISTRO_NAME = "Oniro Project Base Zephyr Distro"
DISTRO_VERSION = "1.0.0-beta"
--
GitLab