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

Skip Catalyst stage2 as recommended by upstream Gentoo #2153

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Conversation

chewi
Copy link
Contributor

@chewi chewi commented Jul 24, 2024

Skip Catalyst stage2 as recommended by upstream Gentoo

From https://wiki.gentoo.org/wiki/Catalyst/Stage_Creation#Build_Stage3:

It is not necessary to build stage2 in order to build stage3. Gentoo
release engineering does not build stage2, and you should not need to
unless you're intentionally building a stage2 as your goal.

We can now sync portage-stable/scripts with upstream because bootstrap.sh is only used during stage2, and the changes we had are no longer relevant. It seems likely the changes were already redundant anyway.

Apart from making things simpler, judging by a glance at Jenkins, it knocks about half an hour off the build time.

How to use

Build the SDK with ./bootstrap_sdk as usual.

Testing done

A two-phase Jenkins build was successful. No notable changes were reported.

  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update) -- N/A
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

@chewi chewi requested a review from a team July 24, 2024 14:23
Copy link
Member

@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.

The docs will need a rewrite/clarifications, because they are confusing me in some places. But can be done as a follow-up PR.

From https://wiki.gentoo.org/wiki/Catalyst/Stage_Creation#Build_Stage3:

> It is not necessary to build stage2 in order to build stage3. Gentoo
> release engineering does not build stage2, and you should not need to
> unless you're intentionally building a stage2 as your goal.

We can now sync portage-stable/scripts with upstream because
bootstrap.sh is only used during stage2, and the changes we had are no
longer relevant. It seems likely the changes were already redundant
anyway.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants