Skip to content
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

Closed
wants to merge 26 commits into from

Conversation

CBL-Mariner-Bot
Copy link
Collaborator

@CBL-Mariner-Bot CBL-Mariner-Bot commented Jan 25, 2024

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

@gjswalling gjswalling changed the title [AUTOPATCHER-CORE] Upgrade grub2 to 2.12 fixes and features in latest full release, 2.06 is outdated Upgrade grub2 to 2.12 fixes and features in latest full release, 2.06 is outdated Jan 26, 2024
@gjswalling gjswalling changed the title Upgrade grub2 to 2.12 fixes and features in latest full release, 2.06 is outdated Upgrade grub2 from 2.06 to 2.12 Jan 26, 2024
@mfrw mfrw added the 3.0-dev PRs Destined for AzureLinux 3.0 label Jan 29, 2024
@gjswalling gjswalling force-pushed the cblmargh/grub2-upgrade-to-2.12-3.0-dev branch from 20c00c1 to 6d00dbc Compare February 21, 2024 19:36
@gjswalling gjswalling force-pushed the cblmargh/grub2-upgrade-to-2.12-3.0-dev branch from 42caf7d to 2e3d7b8 Compare March 26, 2024 21:02
@gjswalling gjswalling marked this pull request as ready for review April 2, 2024 00:10
@gjswalling gjswalling requested review from a team as code owners April 2, 2024 00:10
@CBL-Mariner-Bot CBL-Mariner-Bot requested review from a team as code owners April 24, 2024 22:21
@@ -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
Copy link
Member

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.

Copy link
Member

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 

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anphel31 anphel31 self-requested a review May 9, 2024 19:52
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##'`"
Copy link
Member

@anphel31 anphel31 May 10, 2024

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

@gjswalling gjswalling marked this pull request as draft May 15, 2024 20:27
@gjswalling gjswalling force-pushed the cblmargh/grub2-upgrade-to-2.12-3.0-dev branch from 2e6ddf2 to 6165523 Compare May 31, 2024 16:07
@gjswalling gjswalling mentioned this pull request Jun 14, 2024
13 tasks
@gjswalling gjswalling closed this Jun 17, 2024
@gjswalling
Copy link
Contributor

replaced by new PR : #9407

@jslobodzian jslobodzian deleted the cblmargh/grub2-upgrade-to-2.12-3.0-dev branch August 9, 2024 03:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.0-dev PRs Destined for AzureLinux 3.0 Automatic PR AutoUpgrade Core
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants