diff --git a/meta-ohos-core/conf/distro/include/x-wic.inc b/meta-ohos-core/conf/distro/include/x-wic.inc index 4168177eb41bf305e0ae2dbf3e3714cc69ed5a4a..a110a7057aa6057727feb21c594b889ca8b7a9d7 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 56cd18b6fd8bce4ba80cdd30e7c4f575227657f6..330328838339a05b1dca688afa5f316ee898b36b 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 fac9e0d52e674ea52074d592d07a947430760f8a..ad6fbf5a427fbb7864125a77e9ecb4ca93d5489b 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 b0c5575438654af6b193796f17682a074416c335..133e82a9f19408384037d503c0373a9c99e88287 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 8d30a44c876fbeceaba1a3d60230fad59b8b97c9..6b7c1a7175819c05603762d18d733bb5b89cb5e7 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 0dca71c7d879b6bbd766272b735d52476070ff85..98ab4740ff5167aea0bb6dbd0903ff8e17bb85ff 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}