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 3a0fce09ccd43f13a6446edb96e78e7a39452ebd..09f429647d62697e97e4ee90ee391c5460d6e1e0 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 5781836c62b41b82716f96d63e31d4948e312f10..ef0968a0b108eb818f522c49ab52c2a61606e014 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 6400bcf024a0b7c5348c3a3e80cf26ec4ebcd521..800bf8748f8a03d75b6987c4c38e256125100a61 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 02c15eb3e872d0751c0e493f4532002bdf539433..12961f350888566300fa13c7b57822fc2b042964 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 07e0b4b38d7e33a277e460741a54c93d6def6190..f37ab6b65c125a80e34d3004ff31d4d001c503da 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 \ "