From d43fde300f77f97b5222ec8471de8662cfffcc01 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Fri, 8 Oct 2021 15:57:34 +0200
Subject: [PATCH] packagegroups: Project rename
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
.../recipes-core/images/allscenarios-image-base-tests.bb | 2 +-
.../recipes-core/images/allscenarios-image-common.inc | 4 ++--
.../recipes-core/images/allscenarios-image-extra-tests.bb | 2 +-
...roup-allscenarios-core.bb => packagegroup-oniro-core.bb} | 4 ++--
...up-allscenarios-tests.bb => packagegroup-oniro-tests.bb} | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
rename meta-ohos-core/recipes-core/packagegroups/{packagegroup-allscenarios-core.bb => packagegroup-oniro-core.bb} (67%)
rename meta-ohos-core/recipes-core/packagegroups/{packagegroup-allscenarios-tests.bb => packagegroup-oniro-tests.bb} (55%)
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
index 3a0fce09..09f42964 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
@@ -7,7 +7,7 @@ require recipes-core/images/allscenarios-image-base.bb
SUMMARY = "AllScenariOS image including the base OS software stack and tests"
IMAGE_INSTALL_append = "\
- packagegroup-allscenarios-tests \
+ packagegroup-oniro-tests \
"
# This adds ptest packages to the image
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc b/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
index 5781836c..ef0968a0 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
@@ -2,12 +2,12 @@
#
# SPDX-License-Identifier: Apache-2.0
-# Common settings for all AllScenariOS images
+# Common settings for all Oniro images
inherit ohos-image
IMAGE_INSTALL_append = "\
- packagegroup-allscenarios-core \
+ packagegroup-oniro-core \
packagegroup-net-essentials \
packagegroup-ble-essentials \
sysota \
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
index 6400bcf0..800bf874 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
@@ -8,7 +8,7 @@ SUMMARY = "AllScenariOS Wayland image including the base OS \
software stack and tests"
IMAGE_INSTALL_append = "\
- packagegroup-allscenarios-tests \
+ packagegroup-oniro-tests \
"
# This adds ptest packages to the image
diff --git a/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-core.bb b/meta-ohos-core/recipes-core/packagegroups/packagegroup-oniro-core.bb
similarity index 67%
rename from meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-core.bb
rename to meta-ohos-core/recipes-core/packagegroups/packagegroup-oniro-core.bb
index 02c15eb3..12961f35 100644
--- a/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-core.bb
+++ b/meta-ohos-core/recipes-core/packagegroups/packagegroup-oniro-core.bb
@@ -6,8 +6,8 @@ DESCRIPTION = "Core package group groups for OS foundation"
inherit packagegroup
-PACKAGES = "packagegroup-allscenarios-core"
+PACKAGES = "packagegroup-oniro-core"
-RDEPENDS_packagegroup-allscenarios-core = "\
+RDEPENDS_packagegroup-oniro-core = "\
oniro-mounts \
"
diff --git a/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-tests.bb b/meta-ohos-core/recipes-core/packagegroups/packagegroup-oniro-tests.bb
similarity index 55%
rename from meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-tests.bb
rename to meta-ohos-core/recipes-core/packagegroups/packagegroup-oniro-tests.bb
index 07e0b4b3..f37ab6b6 100644
--- a/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-tests.bb
+++ b/meta-ohos-core/recipes-core/packagegroups/packagegroup-oniro-tests.bb
@@ -2,15 +2,15 @@
#
# SPDX-License-Identifier: Apache-2.0
-DESCRIPTION = "AllScenariOS tests package group"
+DESCRIPTION = "Oniro Project tests package group"
inherit packagegroup
PACKAGES = "\
- packagegroup-allscenarios-tests \
+ packagegroup-oniro-tests \
"
-RDEPENDS_packagegroup-allscenarios-tests = "\
+RDEPENDS_packagegroup-oniro-tests = "\
ohos-xts-acts \
ptest-runner \
"
--
GitLab