Skip to content

Update gentoo submodule to 232fc7d06685 - #4348

Open
flatcar-infra wants to merge 1 commit into
mainfrom
buildbot/update-gentoo-submodule
Open

flatcar-infra wants to merge 1 commit into
mainfrom
buildbot/update-gentoo-submodule

Conversation

@flatcar-infra

@flatcar-infra flatcar-infra commented Nov 1, 2026 •

Copy link
Copy Markdown

Update sdk_container/src/third_party/gentoo to flatcar-hub/gentoo@232fc7d.

@flatcar-infra flatcar-infra added auto-ci jenkins-ci Perform a CI build using Jenkins rather than GitHub Actions main labels Nov 1, 2026
@flatcar-infra
flatcar-infra requested a review from a team as a code owner November 1, 2026 04:03
@flatcar-infra
flatcar-infra force-pushed the buildbot/update-gentoo-submodule branch from 9d54beb to 013328d Compare November 2, 2026 04:03
@flatcar-infra flatcar-infra changed the title Update gentoo submodule to ce8854c24d63 Update gentoo submodule to fc2ce7274572 Nov 2, 2026
@t-lo

t-lo commented Nov 2, 2026

Copy link
Copy Markdown
Member
04:09:15   �[32m*�[0m Applying user patches from /etc/portage/patches ...
04:09:15   �[32m*�[0m Applying 0001-uniq-fix-read-overrun-with-w.patch ...
04:09:15  patching file src/uniq.c
04:09:15  Hunk #1 FAILED at 285.
04:09:15  1 out of 1 hunk FAILED -- saving rejects to file src/uniq.c.rej
04:09:15  �[A�[72C �[34;01m[ �[31;01m!!�[34;01m ]�[0m
04:09:15   �[31;01m*�[0m ERROR: sys-apps/coreutils-9.12::gentoo failed (prepare phase):
04:09:15   �[31;01m*�[0m   patch '-p1' '-f' '-g0' '--no-backup-if-mismatch' failed with '/etc/portage/patches/sys-apps/coreutils/0001-uniq-fix-read-overrun-with-w.patch'

Curious, applying a coreutils patch failed. Did upstream coreutils ingest it and Gentoo should stop carrying it?

@chewi

chewi commented Nov 2, 2026

Copy link
Copy Markdown
Contributor

Can't look yet, but yes, that's my guess.

@flatcar-infra flatcar-infra changed the title Update gentoo submodule to fc2ce7274572 Update gentoo submodule to b30d7c4928ee Nov 3, 2026
@flatcar-infra
flatcar-infra force-pushed the buildbot/update-gentoo-submodule branch 2 times, most recently from c40050d to 7057867 Compare November 4, 2026 04:03
@flatcar-infra flatcar-infra changed the title Update gentoo submodule to b30d7c4928ee Update gentoo submodule to 86dd140a5903 Nov 4, 2026
@chewi

chewi commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

I've checked now, 9.12 does include these changes. The patches need to be dropped.

@flatcar-infra
flatcar-infra force-pushed the buildbot/update-gentoo-submodule branch from 3803c33 to 08d7e67 Compare November 5, 2026 04:03
@flatcar-infra flatcar-infra changed the title Update gentoo submodule to 86dd140a5903 Update gentoo submodule to 9374e148b923 Nov 5, 2026
@flatcar-infra
flatcar-infra force-pushed the buildbot/update-gentoo-submodule branch from 08d7e67 to 27c2328 Compare November 5, 2026 16:36
@flatcar-infra flatcar-infra changed the title Update gentoo submodule to 9374e148b923 Update gentoo submodule to 16dc2778804d Nov 5, 2026
@t-lo

t-lo commented Nov 5, 2026

Copy link
Copy Markdown
Member

Fixed the issue in #4359 and kicked off another run.

@flatcar-infra
flatcar-infra force-pushed the buildbot/update-gentoo-submodule branch from 27c2328 to a5f1993 Compare November 6, 2026 15:46
@flatcar-infra flatcar-infra changed the title Update gentoo submodule to 16dc2778804d Update gentoo submodule to 232fc7d06685 Nov 6, 2026
@t-lo

t-lo commented Nov 6, 2026 •

Copy link
Copy Markdown
Member

It's crun now:

17:40:08   �[32m*�[0m Applying 0001-cve-2026-88264.patch ...
17:40:08  patching file src/libcrun/linux.c
17:40:08  Hunk #1 succeeded at 4305 (offset 267 lines).
17:40:08  Hunk #2 FAILED at 4055.
17:40:08  1 out of 2 hunks FAILED -- saving rejects to file src/libcrun/linux.c.rej
17:40:08  patching file tests/test_devices.py
17:40:08  Hunk #1 succeeded at 474 with fuzz 1 (offset 75 lines).
17:40:08  Hunk #2 FAILED at 578.
17:40:08  1 out of 2 hunks FAILED -- saving rejects to file tests/test_devices.py.rej
17:40:08  �[A�[72C �[34;01m[ �[31;01m!!�[34;01m ]�[0m
17:40:08   �[31;01m*�[0m ERROR: app-containers/crun-1.30.1::gentoo failed (prepare phase):

PR/fix incoming.

@t-lo

t-lo commented Nov 6, 2026

Copy link
Copy Markdown
Member

Note to self: Never reference a comment in a PR in another PR with the term "fixes: " before that link. Caused this PR to be auto-closed 😱

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
@flatcar-infra
flatcar-infra force-pushed the buildbot/update-gentoo-submodule branch from a5f1993 to b36e496 Compare November 6, 2026 17:07

This branch was successfully deployed

No deployments
development — a5f1993d Deployed Nov 6, 2026 by t-lo via Wait for approval #6097
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-ci jenkins-ci Perform a CI build using Jenkins rather than GitHub Actions main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants