From 90dde49e9b436ee2bae3a4cc0aec5a021a8098fa Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Tue, 3 Aug 2021 10:39:07 +0100
Subject: [PATCH] x-wic.inc: Rename *DEVICEDATA* to *DEVDATA* for consistency
This makes things cleaner and more consistent when the other partitions
use variables like:
SYSDATA_PARTITION_SIZE
APPDATA_PARTITION_SIZE
etc.
Keep this change consistent on the wic files too.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-ohos-core/conf/distro/include/x-wic.inc | 6 +++---
meta-ohos-core/wic/x-avenger96.wks.in | 2 +-
meta-ohos-core/wic/x-efi-systemd-microcode.wks.in | 2 +-
meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in | 2 +-
meta-ohos-core/wic/x-qemux86-directdisk.wks.in | 2 +-
meta-ohos-core/wic/x-raspberrypi.wks.in | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta-ohos-core/conf/distro/include/x-wic.inc b/meta-ohos-core/conf/distro/include/x-wic.inc
index 4168177e..a110a705 100644
--- a/meta-ohos-core/conf/distro/include/x-wic.inc
+++ b/meta-ohos-core/conf/distro/include/x-wic.inc
@@ -12,7 +12,7 @@ ROOT_PARTITION_SIZE_seco-intel-b68 ?= "1536M"
ROOT_PARTITION_SIZE ?= "1G"
ROOTA_PARTITION_SIZE = "${ROOT_PARTITION_SIZE}"
ROOTB_PARTITION_SIZE = "${ROOT_PARTITION_SIZE}"
-DEVICEDATA_PARTITION_SIZE ?= "8M"
+DEVDATA_PARTITION_SIZE ?= "8M"
SYSDATA_PARTITION_SIZE ?= "512M"
APPDATA_PARTITION_SIZE ?= "1G"
@@ -24,7 +24,7 @@ ROOT_FSTYPE ?= "squashfs"
#
WIC_ROOTA_PARTITION_EXTRA_ARGS ??= ""
WIC_ROOTB_PARTITION_EXTRA_ARGS ??= ""
-WIC_DEVICEDATA_PARTITION_EXTRA_ARGS ??= ""
+WIC_DEVDATA_PARTITION_EXTRA_ARGS ??= ""
WIC_SYSDATA_PARTITION_EXTRA_ARGS ??= ""
WIC_APPDATA_PARTITION_EXTRA_ARGS ??= ""
@@ -34,6 +34,6 @@ WIC_ROOTA_PARTITION ?= "part / --source rootfs --use-uuid --fstype=${ROOT_FSTYPE
${WIC_ROOTA_PARTITION_EXTRA_ARGS}"
WIC_ROOTB_PARTITION ?= "part --align 4096 --fixed-size ${ROOTB_PARTITION_SIZE} \
${WIC_ROOTB_PARTITION_EXTRA_ARGS}"
-WIC_DEVICEDATA_PARTITION ?= "part --fstype=ext4 --label x-dev-data --mkfs-extraopts '-T default' --align 4096 --fixed-size ${DEVICEDATA_PARTITION_SIZE} ${WIC_DEVICEDATA_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}"
diff --git a/meta-ohos-core/wic/x-avenger96.wks.in b/meta-ohos-core/wic/x-avenger96.wks.in
index 56cd18b6..33032883 100644
--- a/meta-ohos-core/wic/x-avenger96.wks.in
+++ b/meta-ohos-core/wic/x-avenger96.wks.in
@@ -23,6 +23,6 @@ part fip --source rawcopy --sourceparams="file=fip/fip-stm32mp157a-av96-trusted.
part --source bootimg-partition --fstype=ext4 --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
-${WIC_DEVICEDATA_PARTITION}
+${WIC_DEVDATA_PARTITION}
${WIC_SYSDATA_PARTITION}
${WIC_APPDATA_PARTITION}
diff --git a/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in b/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in
index fac9e0d5..ad6fbf5a 100644
--- a/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in
+++ b/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in
@@ -21,6 +21,6 @@ bootloader --ptable gpt --timeout=5 --append=" rootfstype=ext4 "
part --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
-${WIC_DEVICEDATA_PARTITION}
+${WIC_DEVDATA_PARTITION}
${WIC_SYSDATA_PARTITION}
${WIC_APPDATA_PARTITION}
diff --git a/meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in b/meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in
index b0c55754..133e82a9 100644
--- a/meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in
+++ b/meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in
@@ -25,6 +25,6 @@ part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --no-table --
part --source bootimg-partition --fstype=vfat --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
-${WIC_DEVICEDATA_PARTITION}
+${WIC_DEVDATA_PARTITION}
${WIC_SYSDATA_PARTITION}
${WIC_APPDATA_PARTITION}
diff --git a/meta-ohos-core/wic/x-qemux86-directdisk.wks.in b/meta-ohos-core/wic/x-qemux86-directdisk.wks.in
index 8d30a44c..6b7c1a71 100644
--- a/meta-ohos-core/wic/x-qemux86-directdisk.wks.in
+++ b/meta-ohos-core/wic/x-qemux86-directdisk.wks.in
@@ -23,6 +23,6 @@ bootloader --source bootimg-pcbios --timeout=0 --append="oprofile.timer=1 rootfs
part --source bootimg-pcbios --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
-${WIC_DEVICEDATA_PARTITION}
+${WIC_DEVDATA_PARTITION}
${WIC_SYSDATA_PARTITION}
${WIC_APPDATA_PARTITION}
diff --git a/meta-ohos-core/wic/x-raspberrypi.wks.in b/meta-ohos-core/wic/x-raspberrypi.wks.in
index 0dca71c7..98ab4740 100644
--- a/meta-ohos-core/wic/x-raspberrypi.wks.in
+++ b/meta-ohos-core/wic/x-raspberrypi.wks.in
@@ -28,6 +28,6 @@ bootloader --ptable msdos
part --source bootimg-partition --fstype=vfat --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
-${WIC_DEVICEDATA_PARTITION}
+${WIC_DEVDATA_PARTITION}
${WIC_SYSDATA_PARTITION}
${WIC_APPDATA_PARTITION}
--
GitLab