diff --git a/meta-ohos-core/wic/x-avenger96.wks.in b/meta-ohos-core/wic/x-avenger96.wks.in index 9295493f30c5b10a3adf2acdb810002d68e79b53..db5d903fbaaa9aa93270ea4c49c3ba02837cdc98 100644 --- a/meta-ohos-core/wic/x-avenger96.wks.in +++ b/meta-ohos-core/wic/x-avenger96.wks.in @@ -20,7 +20,7 @@ bootloader --ptable gpt part fsbl1 --source rawcopy --sourceparams="file=arm-trusted-firmware/tf-a-stm32mp157a-av96-sdcard.stm32" --part-name fsbl1 --part-type 8DA63339-0007-60C0-C436-083AC8230908 --offset 17 part fsbl2 --source rawcopy --sourceparams="file=arm-trusted-firmware/tf-a-stm32mp157a-av96-sdcard.stm32" --part-name fsbl2 --part-type 8DA63339-0007-60C0-C436-083AC8230908 --offset 273 part fip --source rawcopy --sourceparams="file=fip/fip-stm32mp157a-av96-trusted.bin" --part-name fip --part-type 8DA63339-0007-60C0-C436-083AC8230908 --offset 529 -part --source bootimg-partition --fstype=ext4 --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 +part --source bootimg-partition --fstype=ext4 --label ${BOOT_PARTITION_LABEL} --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 ${WIC_ROOTA_PARTITION} ${WIC_ROOTB_PARTITION} ${WIC_DEVDATA_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 9f46e67fd3d3219723e6d38e1c15ebd91edc38fd..9fbaa69c88e1827a74c56ad9cd474414eac8cd50 100644 --- a/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in +++ b/meta-ohos-core/wic/x-efi-systemd-microcode.wks.in @@ -18,7 +18,7 @@ bootloader --ptable gpt --timeout=5 --append=" rootfstype=ext4 " -part --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 +part --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --label ${BOOT_PARTITION_LABEL} --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 ${WIC_ROOTA_PARTITION} ${WIC_ROOTB_PARTITION} ${WIC_DEVDATA_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 cffa5c9feda3a8123a102004922490bb7ec6152a..ec4803601bd4feddcd8b3d1259008e11fc78c12f 100644 --- a/meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in +++ b/meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in @@ -22,7 +22,7 @@ bootloader --ptable msdos part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --no-table --align 1 -part --source bootimg-partition --fstype=vfat --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 +part --source bootimg-partition --fstype=vfat --label ${BOOT_PARTITION_LABEL} --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 ${WIC_ROOTA_PARTITION} ${WIC_ROOTB_PARTITION} ${WIC_DEVDATA_PARTITION} diff --git a/meta-ohos-core/wic/x-qemux86-directdisk.wks.in b/meta-ohos-core/wic/x-qemux86-directdisk.wks.in index 357478cf87b364c84dabe33f94195c03c451ef7b..c1578be2691d897c03c0966889e68ae5b0096609 100644 --- a/meta-ohos-core/wic/x-qemux86-directdisk.wks.in +++ b/meta-ohos-core/wic/x-qemux86-directdisk.wks.in @@ -20,7 +20,7 @@ bootloader --source bootimg-pcbios-label --timeout=0 --append="oprofile.timer=1 rootfstype=${ROOT_FSTYPE}" -part --source bootimg-pcbios-label --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 +part --source bootimg-pcbios-label --label ${BOOT_PARTITION_LABEL} --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 ${WIC_ROOTA_PARTITION} ${WIC_ROOTB_PARTITION} ${WIC_DEVDATA_PARTITION} diff --git a/meta-ohos-core/wic/x-raspberrypi.wks.in b/meta-ohos-core/wic/x-raspberrypi.wks.in index a57131319721f0492b79a52306caeffc121c49b1..50863bed092645067beaeb9985aeb87952c43156 100644 --- a/meta-ohos-core/wic/x-raspberrypi.wks.in +++ b/meta-ohos-core/wic/x-raspberrypi.wks.in @@ -25,7 +25,7 @@ bootloader --ptable msdos -part --source bootimg-partition --fstype=vfat --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 +part --source bootimg-partition --fstype=vfat --label ${BOOT_PARTITION_LABEL} --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096 ${WIC_ROOTA_PARTITION} ${WIC_ROOTB_PARTITION} ${WIC_DEVDATA_PARTITION}