[PATCH 0/1] Grub2 clang MBR image fix

[PATCH 0/1] Grub2 clang MBR image fix

[Nicholas Vinson]

When building grub, the files boot.img and diskboot.img are generated from ELF
reference images and have the expectation that they will be 512 bytes inside
each. However, when GRUB is built with clang, these files become bigger than
512-bytes because the name of the ELF interpreter is appended to each image due
to Clang creating a '.interp' section in the ELF reference image.

This patch corrects that issue by updating the objcopy calls so the '.interp'
section is not included when extracting the code from the ELF reference images.

Nicholas Vinson (1):
  gentpl.py: Remove .interp section from .img files.

 gentpl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.39.0

[PATCH 1/1] gentpl.py: Remove .interp section from .img files.

[Nicholas Vinson]

Whn building .img files, a .interp section from the .image files will
sometimes be copied into the .img file. This additional section pushes
the .img file beyond the 512-byte limit and causes grub-install to fail
to run for i386-pc platforms.

Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
---
 gentpl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentpl.py b/gentpl.py
index 9f51e4fb6..88abe5b0a 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -766,7 +766,7 @@ def image(defn, platform):
 if test x$(TARGET_APPLE_LINKER) = x1; then \
   $(MACHO2IMG) $< $@; \
 else \
-  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
+  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx -R .interp $< $@; \
 fi
 """)
 
-- 
2.39.0

Re: [PATCH 1/1] gentpl.py: Remove .interp section from .img files.

[Vladimir 'phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]

LGTM

On Fri, 13 Jan 2023 at 10:58, Nicholas Vinson <nvinson234@gmail.com> wrote:

> Whn building .img files, a .interp section from the .image files will
> sometimes be copied into the .img file. This additional section pushes
> the .img file beyond the 512-byte limit and causes grub-install to fail
> to run for i386-pc platforms.
>
> Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
> ---
>  gentpl.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gentpl.py b/gentpl.py
> index 9f51e4fb6..88abe5b0a 100644
> --- a/gentpl.py
> +++ b/gentpl.py
> @@ -766,7 +766,7 @@ def image(defn, platform):
>  if test x$(TARGET_APPLE_LINKER) = x1; then \
>    $(MACHO2IMG) $< $@; \
>  else \
> -  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS)
> --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R
> .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R
> .note.gnu.property -R .ARM.exidx $< $@; \
> +  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS)
> --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R
> .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R
> .note.gnu.property -R .ARM.exidx -R .interp $< $@; \
>  fi
>  """)
>
> --
> 2.39.0
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel
>
-- 
Regards
Vladimir 'phcoder' Serbinenko

[-- Attachment #2: Type: text/html, Size: 2259 bytes --]

Re: [PATCH 1/1] gentpl.py: Remove .interp section from .img files.

[Daniel Kiper]

On Fri, Jan 13, 2023 at 02:56:35AM -0500, Nicholas Vinson wrote:
> Whn building .img files, a .interp section from the .image files will
> sometimes be copied into the .img file. This additional section pushes
> the .img file beyond the 512-byte limit and causes grub-install to fail
> to run for i386-pc platforms.
>
> Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel