x-wic.inc: Rename partition labels

Our initial implementation defines the partitions labels as it follows:
x-boot
x-dev-data
x-sys-data
x-app-data

This was proven to be problematic in many ways.

First of all, this needs to be treated with care as the associated
systemd mount unit would need to escape the dashes. For example,
"x-dev-data" would need to have a mount unit associated escaping this to
"x\x2ddev\x2ddata".

Secondly, the yocto version we are using (dunfell) has a bug where
backslashes are not supported in SRC_URI[1]. This would require a
workaround when using mount points with an escaped filename.

The easiest way forward would be to just not use dashes for the labels.
In this way, we maintain consistentcy for the mountpoints (/mnt/<label>)
without having to deal with all the above.

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=8161



Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>

meta-ohos-core/conf/distro/include/x-wic.inc

@@ -6,14 +6,22 @@
 # supported devices. This configuration is taking into consideration OTA design
 # and strategies.
 
+BOOT_PARTITION_LABEL ?= "boot"
 BOOT_PARTITION_SIZE ?= "512M"
+
 # The SECO B68 board pulls in almost half a Gigabyte worth of linux-firmware.
 ROOT_PARTITION_SIZE_seco-intel-b68 ?= "1536M"
 ROOT_PARTITION_SIZE ?= "1G"
 ROOTA_PARTITION_SIZE = "${ROOT_PARTITION_SIZE}"
 ROOTB_PARTITION_SIZE = "${ROOT_PARTITION_SIZE}"
+
+DEVDATA_PARTITION_LABEL ?= "devdata"
 DEVDATA_PARTITION_SIZE ?= "8M"
+
+SYSDATA_PARTITION_LABEL ?= "sysdata"
 SYSDATA_PARTITION_SIZE ?= "512M"
+
+APPDATA_PARTITION_LABEL ?= "appdata"
 APPDATA_PARTITION_SIZE ?= "1G"
 
 # Default root filesystem type is squashfs.
@@ -36,6 +44,6 @@ WIC_ROOTB_PARTITION ?= "part / --source rootfs --use-uuid --fstype=${ROOT_FSTYPE
                         ${@bb.utils.contains('ROOT_FSTYPE', 'ext4', '--mkfs-extraopts \'-T default\'', '', d)} \
                         --align 4096 --fixed-size ${ROOTB_PARTITION_SIZE} \
                         ${WIC_ROOTB_PARTITION_EXTRA_ARGS}"
-WIC_DEVDATA_PARTITION ?= "part --fstype=ext4 --label x-dev-data --mkfs-extraopts '-T default' --align 4096 --fixed-size ${DEVDATA_PARTITION_SIZE} ${WIC_DEVDATA_PARTITION_EXTRA_ARGS}"
-WIC_SYSDATA_PARTITION ?= "part --fstype=ext4 --label x-sys-data --mkfs-extraopts '-T default' --align 4096 --fixed-size ${SYSDATA_PARTITION_SIZE} ${WIC_SYSDATA_PARTITION_EXTRA_ARGS}"
-WIC_APPDATA_PARTITION ?= "part --fstype=ext4 --label x-app-data --mkfs-extraopts '-T default' --align 4096 --fixed-size ${APPDATA_PARTITION_SIZE} ${WIC_APPDATA_PARTITION_EXTRA_ARGS}"
+WIC_DEVDATA_PARTITION ?= "part --fstype=ext4 --label ${DEVDATA_PARTITION_LABEL} --mkfs-extraopts '-T default' --align 4096 --fixed-size ${DEVDATA_PARTITION_SIZE} ${WIC_DEVDATA_PARTITION_EXTRA_ARGS}"
+WIC_SYSDATA_PARTITION ?= "part --fstype=ext4 --label ${SYSDATA_PARTITION_LABEL} --mkfs-extraopts '-T default' --align 4096 --fixed-size ${SYSDATA_PARTITION_SIZE} ${WIC_SYSDATA_PARTITION_EXTRA_ARGS}"
+WIC_APPDATA_PARTITION ?= "part --fstype=ext4 --label ${APPDATA_PARTITION_LABEL} --mkfs-extraopts '-T default' --align 4096 --fixed-size ${APPDATA_PARTITION_SIZE} ${WIC_APPDATA_PARTITION_EXTRA_ARGS}"