diff mbox series

[1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update

Message ID 20220131212456.3176156-1-geomatsi@gmail.com
State Accepted
Headers show
Series [1/2] board/orangepi/orangepi-zero-plus2: fix build after genimage update | expand

Commit Message

Sergey Matyukevich Jan. 31, 2022, 9:24 p.m. UTC
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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Giulio Benetti Feb. 1, 2022, 6 p.m. UTC | #1
Hi Sergey,

On 31/01/22 22:24, Sergey Matyukevich 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.

Here we need a:
Fixes:
url where you point the failure

Best regards
Sergey Matyukevich Feb. 1, 2022, 6:11 p.m. UTC | #2
> Hi Sergey,
> 
> On 31/01/22 22:24, Sergey Matyukevich 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.
> 
> Here we need a:
> Fixes:
> url where you point the failure

You are right. But I don't have a CI report for this. I noticed the problem when
building images locally.

Regards,
Sergey
Giulio Benetti Feb. 1, 2022, 6:18 p.m. UTC | #3
On 01/02/22 19:11, Sergey Matyukevich wrote:
>> Hi Sergey,
>>
>> On 31/01/22 22:24, Sergey Matyukevich 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.
>>
>> Here we need a:
>> Fixes:
>> url where you point the failure
> 
> You are right. But I don't have a CI report for this. I noticed the problem when
> building images locally.

Check here for this patch:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371

for the other you've found it locally.
Thomas Petazzoni Feb. 6, 2022, 10:47 a.m. UTC | #4
On Tue,  1 Feb 2022 00:24:55 +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.
> 
> Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
> ---
>  board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Both applied, thanks! In the commit log of the first patch, I've added
a reference to the Gitlab CI failure that the patch is fixing, as
suggested by Giulio.

Thanks!

Thomas
diff mbox series

Patch

diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg
index aee9719ae4..5a7ee7707a 100644
--- a/board/orangepi/orangepi-zero-plus2/genimage.cfg
+++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg
@@ -22,11 +22,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"
 	}
@@ -34,7 +34,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 = 256M
 	}