-
Notifications
You must be signed in to change notification settings - Fork 568
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade grub2 from 2.06 to 2.12 #7479
Conversation
20c00c1
to
6d00dbc
Compare
42caf7d
to
2e3d7b8
Compare
@@ -214,18 +127,16 @@ Requires: %{name}-configuration = %{version}-%{release} | |||
Minimal set of utilities to configure a grub-based system | |||
|
|||
%prep | |||
# Remove module_info.ld script due to error "grub2-install: error: Decompressor is too big" | |||
LDFLAGS="`echo " %{build_ldflags} " | sed 's#-Wl,-dT,%{_topdir}/BUILD/module_info.ld##'`" | |||
export LDFLAGS |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't recall why this was added to the prep section. It is probably safe to remove, though, as long as no issues are seen during the build.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here's the full error:
WARN[0035] gpg: imported: 1
WARN[0035] initrd generation of kernel 5.10.60.1-1.cm1 will be triggered later
WARN[0035] initramfs (re)generation triggerin 1 1 2.0-8.cm1
WARN[0035] initramfs 2.0-8.cm1 posttrans
WARN[0047] Installing for i386-pc platform.
WARN[0048] grub2-install: error: Decompressor is too big.
INFO[0048] Flushing all IO to disk for /dev/loop0p2
ERRO[0049] Failed to build image
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
related bug - https://bugs.funtoo.org/browse/FL-8245
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The image build did hit this error ("grub2-install: error: Decompressor is too big.") - https://dev.azure.com/mariner-org/mariner/_build/results?buildId=566907&view=logs&j=2ccbf1db-6c73-5af8-5ba2-cf05469dcf51&t=62118ca4-5f53-54b3-7ec9-8ef4ab0e9237&l=2789
cp %{SOURCE1} gnulib-%{gnulibversion}.tar.gz | ||
tar -zxf gnulib-%{gnulibversion}.tar.gz | ||
mv gnulib-%{gnulibversion} gnulib | ||
|
||
%build | ||
# Remove module_info.ld script due to error "grub2-install: error: Decompressor is too big" | ||
LDFLAGS="`echo " %{build_ldflags} " | sed 's#-Wl,-dT,%{_topdir}/BUILD/module_info.ld##'`" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This appears to still be needed. You can remove it by adding:
%undefine distro_module_ldflags
to the top of the spec
2e6ddf2
to
6165523
Compare
replaced by new PR : #9407 |
Tested on local qemu-kvm install to virtual disk from 3.0 ISO installer (AMD64 and ARM64), as well as AMD64 SCHIE lab node installed to nvme disk (all not using secure boot).
Tested secure boot on libvirt VM following TESTING from shim PR
Confirmed TPM measurement with tpm2_eventlog and /sys/kernel/security/tpm0/binary_bios_measurements
BuddyBuild pipeline ID 567570
FullBuild pipeline ID ?
[AUTOPATCHER-CORE] Upgrade grub2 to 2.12 fixes and features in latest full release, 2.06 is outdated
Upgrade pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=491222&view=results