From 533dc9b7cb296f3ad3bb47a11da9fe6dde13ebc7 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Fri, 8 Oct 2021 17:57:33 +0200
Subject: [PATCH] images: Project rename
Rename all images to matching new project name prefix. Adjust includes
as well as image bbclass to fit.
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
.../recipes-core/images/blueprint-dashboard-gateway-image.bb | 2 +-
.../recipes-core/images/blueprint-gateway-image.bb | 2 +-
.../classes/{ohos-image.bbclass => oniro-image.bbclass} | 2 +-
...allscenarios-image-base-dev.bb => oniro-image-base-dev.bb} | 4 ++--
...cenarios-image-base-tests.bb => oniro-image-base-tests.bb} | 4 ++--
.../{allscenarios-image-base.bb => oniro-image-base.bb} | 4 ++--
.../{allscenarios-image-common.inc => oniro-image-common.inc} | 2 +-
...lscenarios-image-extra-dev.bb => oniro-image-extra-dev.bb} | 4 ++--
...narios-image-extra-tests.bb => oniro-image-extra-tests.bb} | 4 ++--
.../{allscenarios-image-extra.bb => oniro-image-extra.bb} | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
rename meta-ohos-core/classes/{ohos-image.bbclass => oniro-image.bbclass} (99%)
rename meta-ohos-core/recipes-core/images/{allscenarios-image-base-dev.bb => oniro-image-base-dev.bb} (70%)
rename meta-ohos-core/recipes-core/images/{allscenarios-image-base-tests.bb => oniro-image-base-tests.bb} (72%)
rename meta-ohos-core/recipes-core/images/{allscenarios-image-base.bb => oniro-image-base.bb} (54%)
rename meta-ohos-core/recipes-core/images/{allscenarios-image-common.inc => oniro-image-common.inc} (94%)
rename meta-ohos-core/recipes-core/images/{allscenarios-image-extra-dev.bb => oniro-image-extra-dev.bb} (73%)
rename meta-ohos-core/recipes-core/images/{allscenarios-image-extra-tests.bb => oniro-image-extra-tests.bb} (75%)
rename meta-ohos-core/recipes-core/images/{allscenarios-image-extra.bb => oniro-image-extra.bb} (78%)
diff --git a/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb b/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
index 7f126225..2ed67615 100644
--- a/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
+++ b/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-require recipes-core/images/allscenarios-image-base.bb
+require recipes-core/images/oniro-image-base.bb
SUMMARY = "Dashboard blueprint image: gateway"
DESCRIPTION = "Home Assistant based image targeting a gateway device"
diff --git a/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb b/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
index 2c31d8e6..d93a1af5 100644
--- a/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
+++ b/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-require recipes-core/images/allscenarios-image-base.bb
+require recipes-core/images/oniro-image-base.bb
SUMMARY = "Gateway blueprint image"
DESCRIPTION = "Smart home gateway device"
diff --git a/meta-ohos-core/classes/ohos-image.bbclass b/meta-ohos-core/classes/oniro-image.bbclass
similarity index 99%
rename from meta-ohos-core/classes/ohos-image.bbclass
rename to meta-ohos-core/classes/oniro-image.bbclass
index 2a4fc7e5..50071c6a 100644
--- a/meta-ohos-core/classes/ohos-image.bbclass
+++ b/meta-ohos-core/classes/oniro-image.bbclass
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-# All Scenarios OS functionality for images
+# Oniro Project functionality for images
# List of tty to mask getty for
SYSTEMD_MASK_GETTY ?= ""
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb b/meta-ohos-core/recipes-core/images/oniro-image-base-dev.bb
similarity index 70%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-base-dev.bb
index 7d98ae4a..3d15423b 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-base-dev.bb
@@ -3,9 +3,9 @@
# SPDX-License-Identifier: Apache-2.0
require recipes-core/images/core-image-base.bb
-require allscenarios-image-common.inc
+require oniro-image-common.inc
-SUMMARY = "AllScenariOS development image including the base OS software stack"
+SUMMARY = "Oniro Project development image including the base OS software stack"
IMAGE_INSTALL_append = "\
packagegroup-net-tools \
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb b/meta-ohos-core/recipes-core/images/oniro-image-base-tests.bb
similarity index 72%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-base-tests.bb
index 09f42964..d8007971 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-base-tests.bb
@@ -2,9 +2,9 @@
#
# SPDX-License-Identifier: Apache-2.0
-require recipes-core/images/allscenarios-image-base.bb
+require recipes-core/images/oniro-image-base.bb
-SUMMARY = "AllScenariOS image including the base OS software stack and tests"
+SUMMARY = "Oniro Project image including the base OS software stack and tests"
IMAGE_INSTALL_append = "\
packagegroup-oniro-tests \
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base.bb b/meta-ohos-core/recipes-core/images/oniro-image-base.bb
similarity index 54%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-base.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-base.bb
index de4a94d3..84961f18 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-base.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-base.bb
@@ -3,6 +3,6 @@
# SPDX-License-Identifier: Apache-2.0
require recipes-core/images/core-image-base.bb
-require allscenarios-image-common.inc
+require oniro-image-common.inc
-SUMMARY = "AllScenariOS image including the base OS software stack"
+SUMMARY = "Oniro Project image including the base OS software stack"
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc b/meta-ohos-core/recipes-core/images/oniro-image-common.inc
similarity index 94%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
rename to meta-ohos-core/recipes-core/images/oniro-image-common.inc
index ef0968a0..0a135517 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
+++ b/meta-ohos-core/recipes-core/images/oniro-image-common.inc
@@ -4,7 +4,7 @@
# Common settings for all Oniro images
-inherit ohos-image
+inherit oniro-image
IMAGE_INSTALL_append = "\
packagegroup-oniro-core \
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb b/meta-ohos-core/recipes-core/images/oniro-image-extra-dev.bb
similarity index 73%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-extra-dev.bb
index 40e5787f..2041dd1b 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-extra-dev.bb
@@ -2,9 +2,9 @@
#
# SPDX-License-Identifier: Apache-2.0
-require recipes-core/images/allscenarios-image-extra.bb
+require recipes-core/images/oniro-image-extra.bb
-SUMMARY = "AllScenariOS Wayland development image including the base OS \
+SUMMARY = "Oniro Project Wayland development image including the base OS \
software stack and tests"
IMAGE_INSTALL_append = "\
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb b/meta-ohos-core/recipes-core/images/oniro-image-extra-tests.bb
similarity index 75%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-extra-tests.bb
index 800bf874..9f9ee05c 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-extra-tests.bb
@@ -2,9 +2,9 @@
#
# SPDX-License-Identifier: Apache-2.0
-require recipes-core/images/allscenarios-image-extra.bb
+require recipes-core/images/oniro-image-extra.bb
-SUMMARY = "AllScenariOS Wayland image including the base OS \
+SUMMARY = "Oniro Project Wayland image including the base OS \
software stack and tests"
IMAGE_INSTALL_append = "\
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb b/meta-ohos-core/recipes-core/images/oniro-image-extra.bb
similarity index 78%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-extra.bb
index 9245686b..d8751baa 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-extra.bb
@@ -3,9 +3,9 @@
# SPDX-License-Identifier: Apache-2.0
require recipes-graphics/images/core-image-weston.bb
-require allscenarios-image-common.inc
+require oniro-image-common.inc
-SUMMARY = "AllScenariOS Wayland image including the base OS \
+SUMMARY = "Oniro Project Wayland image including the base OS \
software stack"
# The weston image pulls in package manager. We have a root filesystem that is
--
GitLab