| Message ID | 20211227173430.1007471-1-geomatsi@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | board/orangepi/orangepi-pc-plus: fix build after genimage update | expand |
On Mon, 27 Dec 2021 20:34:30 +0300 Sergey Matyukevich <geomatsi@gmail.com> wrote: > ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type > > To fix the first genimage error report, change 'partition-type' entries > to the appropriate 'partition-type-uuid'. Then genimage starts to > complain about overlaps: > > ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000) > ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. > > To fix the second genimage error report, update the size of bootloader > file. Do not reserve additional space for GPT partition table since > new genimage is able to keep track of it. > > Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006300 > > Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com> > --- > board/orangepi/orangepi-pc-plus/genimage.cfg | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas
diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg index e730b38096..3812d785d5 100644 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ b/board/orangepi/orangepi-pc-plus/genimage.cfg @@ -24,11 +24,11 @@ image sdcard.img { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" offset = 8K - size = 1032K # 1MB - 8KB + 16KB(GPT) + size = 1016K # 1MB - 8KB } partition boot { - partition-type = 0xC + partition-type-uuid = "F" bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type = 0x83 + partition-type-uuid = "L" image = "rootfs.ext4" size = 512M }
ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps: ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000) ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole. To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it. Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006300 Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com> --- board/orangepi/orangepi-pc-plus/genimage.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)