Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

sys-boot/grub: sync with gentoo upstream; updates to 2.06 #2098

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

sayanchowdhury
Copy link
Contributor

sys-boot/grub: sync with gentoo upstream; updates to 2.06

Testing done

Jenkins CI http://jenkins.infra.kinvolk.io:8080/job/os/job/manifest/6311/cldsv/

  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)

Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
Copy link
Contributor

@krnowak krnowak left a comment

Choose a reason for hiding this comment

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

Looked at some things, but haven't gone through the GPT code in patches yet.

data directly instead of the generic grub_partition structure. It will
be the basis for modules that need to read/write/update GPT data.

Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe use your work email for signoffs?

Read the verity hash from the kernel binary and pass it to the running
system via the kernel command line

Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com>
Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto.

Comment on lines +80 to +81
# Flatcar: Add arm64 to the list of platforms
GRUB_ALL_PLATFORMS+=( arm64 )
Copy link
Contributor

@krnowak krnowak Aug 22, 2022

Choose a reason for hiding this comment

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

Do we still need this modification? My guess would be that it comes from times when grub in gentoo was not supported on arm64. I also don't understand why this was used for pulling in a cross-compiler…

${PYTHON_DEPS}
app-misc/pax-utils
sys-devel/flex
sys-devel/bison
sys-apps/help2man
sys-apps/texinfo
grub_platforms_arm64? ( cross-aarch64-cros-linux-gnu/gcc )
Copy link
Contributor

Choose a reason for hiding this comment

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

Here you dropped the fonts ( freetype, pkgconfig }. I think it's unnecessary difference between our ebuild and Gentoo - we don't enable fonts USE flag anyway, so it could stay as is.

From 026cab86883e256607f6df30375bfda4468ae71e Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 28 Sep 2014 21:26:21 -0700
Subject: [PATCH] gpt: start new GPT module
Copy link
Contributor

Choose a reason for hiding this comment

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

There is also

commit e49d5b587e46cd4611be2a5a18d2c2f8c9a40281
Author: Michael Marineau <michael.marineau@coreos.com>
Date:   Mon Nov 3 17:14:37 2014 -0800

    gpt: new gptprio.next command for selecting priority based partitions

and I don't see it as separate patch, yet it seems the contents of it are here - did you merge both patches or is this a newer patch from a different repo or branch and not found as is on the flatcar-master branch?

Copy link
Contributor

Choose a reason for hiding this comment

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

In any case it would be good to add all the details in the commit message of your "sys-boot/grub: Apply Flatcar patches" commit.

@pothos
Copy link
Contributor

pothos commented Dec 15, 2022

For testing we have the kola qemu update test but it doesn't cover the downgrade case. This has to be done manually with flatcar-update -F -V 3033… to downgrade to some LTS release and then check that it boots despite the new GRUB.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants