diff mbox series

[v2] wic/bootimg-efi: if fixed-size is set then use that for mkdosfs

Message ID 20230421212613.3660730-1-rs@ti.com
State Accepted, archived
Commit 38e1a235f5eceade7c871f96dc97f6c384384c7b
Headers show
Series [v2] wic/bootimg-efi: if fixed-size is set then use that for mkdosfs | expand

Commit Message

Randolph Sapp April 21, 2023, 9:26 p.m. UTC
This is a bit of a compatibility issue more than anything. Some devices
get upset if the FAT file system contains less blocks than the
partition.

The fixed-size argument is currently respected by the partition creation
step but not by the file system creation step. Let's make it so the file
system respects this value as well.

Signed-off-by: Randolph Sapp <rs@ti.com>
---

Ugh. I muddied up the log statement in the last revision. Fix that here.

 scripts/lib/wic/plugins/source/bootimg-efi.py | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Luca Ceresoli April 24, 2023, 8:48 a.m. UTC | #1
Hello Randolph,

On Fri, 21 Apr 2023 16:26:13 -0500
"Randolph Sapp via lists.openembedded.org"
<rs=ti.com@lists.openembedded.org> wrote:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

As you can see your sender address has been mangled, and as a result
the patch is rejected by the the openembedded git server. This is not
your fault, but we need you to modify your git configuration to prevent
this from happening in the future. Have a look at the wiki for more
info and how to solve that:

https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded#Fixing_your_From_identity

I'm taking your patch for testing on the autobuilders, fixing it
manually so you don't need to resend your patch this time.

Best regards,
Luca
Randolph Sapp April 24, 2023, 3:32 p.m. UTC | #2
On 4/24/23 03:48, Luca Ceresoli wrote:
> Hello Randolph,
> 
> On Fri, 21 Apr 2023 16:26:13 -0500
> "Randolph Sapp via lists.openembedded.org"
> <rs=ti.com@lists.openembedded.org> wrote:
>   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 
> As you can see your sender address has been mangled, and as a result
> the patch is rejected by the the openembedded git server. This is not
> your fault, but we need you to modify your git configuration to prevent
> this from happening in the future. Have a look at the wiki for more
> info and how to solve that:
> 
Ah! Thanks for the heads up. I've just adjust my configs.

> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded#Fixing_your_From_identity
> 
> I'm taking your patch for testing on the autobuilders, fixing it
> manually so you don't need to resend your patch this time.
> 
> Best regards,
> Luca
> 
Cool, thanks!
Paresh Bhagat April 26, 2023, 9:06 a.m. UTC | #3
Hi Randolph

I tested your patch in my local kirkstone build for am62x. SD Card boot is working.
Boot logs here: http://serenity.dal.design.ti.com:7777/ewakutoqom.yaml

Regards,
Paresh
Denys Dmytriyenko May 2, 2023, 11:02 p.m. UTC | #4
On Wed, Apr 26, 2023 at 02:06:59AM -0700, Paresh Bhagat via lists.openembedded.org wrote:
> Hi Randolph
> 
> I tested your patch in my local kirkstone build for am62x. SD Card boot is working.
> Boot logs here: http://serenity.dal.design.ti.com:7777/ewakutoqom.yaml

This is an internal-only resource ^^^
Since you are both TI-ers, don't you think there's a better way to communicate 
this information rather than using a public mailing list? :)
Randolph Sapp May 2, 2023, 11:54 p.m. UTC | #5
On 5/2/23 18:02, Denys Dmytriyenko wrote:
> On Wed, Apr 26, 2023 at 02:06:59AM -0700, Paresh Bhagat via lists.openembedded.org wrote:
>> Hi Randolph
>>
>> I tested your patch in my local kirkstone build for am62x. SD Card boot is working.
>> Boot logs here: http://serenity.dal.design.ti.com:7777/ewakutoqom.yaml
> 
> This is an internal-only resource ^^^
> Since you are both TI-ers, don't you think there's a better way to communicate
> this information rather than using a public mailing list? :)
> 
I was hopping to get a tested-by tag here but I guess that was lost 
somewhere in the communication chain. I already knew this patch worked :)
diff mbox series

Patch

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index a65a5b9780..c28d3917c2 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -390,6 +390,13 @@  class BootimgEFIPlugin(SourcePlugin):
         logger.debug("Added %d extra blocks to %s to get to %d total blocks",
                      extra_blocks, part.mountpoint, blocks)
 
+        # required for compatibility with certain devices expecting file system
+        # block count to be equal to partition block count
+        if blocks < part.fixed_size:
+            blocks = part.fixed_size
+            logger.debug("Overriding %s to %d total blocks for compatibility",
+                     part.mountpoint, blocks)
+
         # dosfs image, created by mkdosfs
         bootimg = "%s/boot.img" % cr_workdir