From 21d5d1c107a9c282c8891ef003044861aa928ea1 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Mon, 11 Oct 2021 12:39:11 +0100
Subject: [PATCH] x-mounts: Rename to oniro-mounts
Fixes: https://git.ostc-eu.org/OSTC/planning/maintenance/-/issues/17
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-ohos-core/classes/writables.bbclass | 4 ++--
.../{x-mounts/x-mounts.bb => oniro-mounts/oniro-mounts.bb} | 0
.../oniro-mounts}/run-mount-appdata.mount | 0
.../oniro-mounts}/run-mount-boot.mount | 0
.../oniro-mounts}/run-mount-devdata.mount | 0
.../oniro-mounts}/run-mount-sysdata.mount | 0
.../packagegroups/packagegroup-allscenarios-core.bb | 2 +-
7 files changed, 3 insertions(+), 3 deletions(-)
rename meta-ohos-core/recipes-core/{x-mounts/x-mounts.bb => oniro-mounts/oniro-mounts.bb} (100%)
rename meta-ohos-core/recipes-core/{x-mounts/x-mounts => oniro-mounts/oniro-mounts}/run-mount-appdata.mount (100%)
rename meta-ohos-core/recipes-core/{x-mounts/x-mounts => oniro-mounts/oniro-mounts}/run-mount-boot.mount (100%)
rename meta-ohos-core/recipes-core/{x-mounts/x-mounts => oniro-mounts/oniro-mounts}/run-mount-devdata.mount (100%)
rename meta-ohos-core/recipes-core/{x-mounts/x-mounts => oniro-mounts/oniro-mounts}/run-mount-sysdata.mount (100%)
diff --git a/meta-ohos-core/classes/writables.bbclass b/meta-ohos-core/classes/writables.bbclass
index 8dc76a9e..0c766a6d 100644
--- a/meta-ohos-core/classes/writables.bbclass
+++ b/meta-ohos-core/classes/writables.bbclass
@@ -39,9 +39,9 @@ SYSTEM_STATE_MOUNT_UNIT ??= "run-mount-sysdata.mount"
# The mount units depend on having the system state partition mounted at a
# known location as described above. The respective system partition mount
-# units are part of the x-mounts package. This provides the
+# units are part of the oniro-mounts package. This provides the
# SYSTEM_STATE_MOUNT_UNIT systemd mount unit.
-RDEPENDS_${PN} += "x-mounts"
+RDEPENDS_${PN} += "oniro-mounts"
# This is the root filesystem hierarchy used as part of the bind mount units to
# provide read-write locations.
diff --git a/meta-ohos-core/recipes-core/x-mounts/x-mounts.bb b/meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts.bb
similarity index 100%
rename from meta-ohos-core/recipes-core/x-mounts/x-mounts.bb
rename to meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts.bb
diff --git a/meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-appdata.mount b/meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-appdata.mount
similarity index 100%
rename from meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-appdata.mount
rename to meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-appdata.mount
diff --git a/meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-boot.mount b/meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-boot.mount
similarity index 100%
rename from meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-boot.mount
rename to meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-boot.mount
diff --git a/meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-devdata.mount b/meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-devdata.mount
similarity index 100%
rename from meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-devdata.mount
rename to meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-devdata.mount
diff --git a/meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-sysdata.mount b/meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-sysdata.mount
similarity index 100%
rename from meta-ohos-core/recipes-core/x-mounts/x-mounts/run-mount-sysdata.mount
rename to meta-ohos-core/recipes-core/oniro-mounts/oniro-mounts/run-mount-sysdata.mount
diff --git a/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-core.bb b/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-core.bb
index b7f4df44..02c15eb3 100644
--- a/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-core.bb
+++ b/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-core.bb
@@ -9,5 +9,5 @@ inherit packagegroup
PACKAGES = "packagegroup-allscenarios-core"
RDEPENDS_packagegroup-allscenarios-core = "\
- x-mounts \
+ oniro-mounts \
"
--
GitLab