Last commit made on 2019-07-09
Get this branch:
git clone -b upstream-eoan https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu
Members of Ubuntu Core Development Team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

578bb11... by Colin Watson

Import grub2_2.04.orig.tar.xz

2a2e10c... by Daniel Kiper <email address hidden>

Release 2.04

Signed-off-by: Daniel Kiper <email address hidden>

f9811a9... by Thomas Schmitt

docs: Document workaround for grub-mkrescue with older MacBooks

Add a description of the workaround for firmware of older MacBooks
which stalls with a grub-mkrescue ISO image for x86_64-efi target
on an USB stick.

Signed-off-by: Thomas Schmitt <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

ff999c8... by Eric Snowberg <email address hidden>

docs: Bootstrap changes required for older distros

Some older distros do not contain gettext 0.18. Document the workaround
to use the bootstrap utility on these systems.

Signed-off-by: Eric Snowberg <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

4e7b5bb... by Leif Lindholm

ia64: build fix in cache.h

Add IA64 to the architectures excluding a declaration for

IA64 does not include any of the source files that require the function,
but was overlooked for d8901e3ba115 ("cache: Fix compilation for ppc,
sparc and arm64").

Add it to the list of excluding architectures in order to not get
missing symbol errors when running grub-mkimage.

Reported-by: Alexander Graf <email address hidden>
Signed-off-by: Leif Lindholm <email address hidden>
Tested-by: John Paul Adrian Glaubitz <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

5610734... by phcoder

hostfs: #undef open and close.

Unlike in case of disks in this case it's just a single place, so it's easier
to just #undef

Signed-off-by: Vladimir Serbinenko <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

8e8723a... by John Paul Adrian Glaubitz

f2fs: Disable gcc9 -Waddress-of-packed-member

Disable the -Wadress-of-packaed-member diagnostic for the grub_f2fs_label
function since the result is found to be false postive.

A pointer to the 'volume_name' member of 'struct grub_f2fs_superblock' is
guaranteed to be aligned as the offset of 'volume_name' within the struct
is dividable by the natural alignment on both 32- and 64-bit targets.

grub-core/fs/f2fs.c: In function ‘grub_f2fs_label’:
grub-core/fs/f2fs.c:1253:60: error: taking address of packed member of ‘struct grub_f2fs_superblock’ may result in an unaligned pointer value [-Werror=address-of-packed-member]
 1253 | *label = (char *) grub_f2fs_utf16_to_utf8 (data->sblock.volume_name);
      | ~~~~~~~~~~~~^~~~~~~~~~~~
cc1: all warnings being treated as errors

Reported-by: Neil MacLeod <email address hidden>
Signed-off-by: John Paul Adrian Glaubitz <email address hidden>
Tested-by: Neil MacLeod <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

53e70d3... by VinceLe

grub-mkrescue: Fix error message about the wrong command having failed: mformat instead of mcopy

Signed-off-by: Vincent Legoll <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

afd6ad4... by Mathieu Trudel-Lapierre

video: skip 'text' gfxpayload if not supported, to fallback to default

On UEFI, 'text' gfxpayload is not supported, but we still reach parse_modespec()
with it, which will obviously fail. Fortunately, whatever gfxpayload is set,
we still still have the 'auto' default to fall back to. Allow getting to this
fallback by not trying to parse 'text' as a modespec.

This is because 'text' correctly doesn't parse as a modespec, and ought to have
been ignored before we got to that point, just like it is immediately picked if
we're running on a system where 'text' is a supported video mode.

Bug: https://savannah.gnu.org/bugs/index.php?56217

Signed-off-by: Mathieu Trudel-Lapierre <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

4ff34fe... by Ovidiu Panait <email address hidden>

grub-mkconfig: Use -c instead of --printf for stat

"--printf" only works with the stat variant provided by coreutils.

With busybox, stat will fail with the following error:
stat: unrecognized option '--printf=%T'

Usage: stat [OPTIONS] FILE...

Signed-off-by: Ovidiu Panait <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>