Skip to content

Weekly portage-stable package updates 2025-06-30 #3062

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

Merged

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Jun 30, 2025

CI: http://jenkins.infra.kinvolk.io:8080/job/container/job/sdk/2137/cldsv/

Had to make a small fix for the way we invoke mksquashfs with pseudofiles (when building pxe image) - we just updated squashfs-tools and the new version seems to be pickier (doesn't like overwriting existing files and probably dropped some heurstics for location of the pseudofile).

--

--

  • changelog
  • image diff

Flatcar Buildbot added 30 commits June 30, 2025 07:06
It's from Gentoo commit db15d48223204aa7ef27420940db13afdf7ec681.
It's from Gentoo commit f05a9f09658ed6754a63f44702778a0a84a765d5.
It's from Gentoo commit 8ad3fd6749ba3a789c749d17f2960f40d4f53327.
It's from Gentoo commit d4938c6219b81cf68cbe9f6d2ef4c0ef6b5afec5.
It's from Gentoo commit 5548e775084b63a65e6eb1c8200489c35f6511ec.
It's from Gentoo commit 145a325080727f7ec5ac470a570ea340b41a3790.
It's from Gentoo commit 08db196e20b63ecb312935a74a2cbaeacbd55074.
It's from Gentoo commit 8cb73c4beaccacbc5eee4115232124240c57716f.
It's from Gentoo commit feaa22ee0e2d3075cb3dfe2b000ebc1b5a06db75.
It's from Gentoo commit ca4e327ff462bd8d645499eab8db503aa71ef301.
It's from Gentoo commit 1fb3c995798907c067dcb45aceb48de8a5a607b6.
It's from Gentoo commit 009ccc332d9109ac20699eab7dadcae0d505a078.
It's from Gentoo commit 3821513c6cdab45cd1175d28a832f82ee9a62a34.
It's from Gentoo commit 464630b66751fade775dd4226c8a7a90583bdc1c.
It's from Gentoo commit dc0d830c133f2f2e8729bb9b192b8712f37ac182.
It's from Gentoo commit 7c6e56f8a75776a22fb2dcb366b99c320de2679e.
It's from Gentoo commit c8821358459e6d7214963ee4f3e931ba6a0085ae.
It's from Gentoo commit 6f59c9d7c2124060d60fe50ad5843ed9dec46f66.
It's from Gentoo commit d0fd4ca962a9dc174ebb1e5a9312c1565e08655a.
It's from Gentoo commit c5e7c362309ca4384648c86a143834d12aded8f1.
It's from Gentoo commit 36d5b8cc699d48a09c0a8b744af438a8728f2982.
It's from Gentoo commit 39e50c16874dfc9993ed2886b7dbebb01b8921f1.
It's from Gentoo commit 0d38eaca61438f163f99787bb3c7490841af9a9d.
It's from Gentoo commit 3d4a1a2fcd573b87b80abec4b2ae98468cbb2acd.
It's from Gentoo commit 9300aac38467fd5c3f95409e0a75b37aca183c99.
It's from Gentoo commit 039177426347c1cfe2e445817d7b073b041ab7a3.
It's from Gentoo commit 8034519193a41fc059be1dd105aa2c9ce2cce36f.
It's from Gentoo commit 129c5c7680f23cc76ccecf337d6c2b026116405a.
It's from Gentoo commit 19b38cbcae05ad27257c878dc5aa9631f93abe3d.
It's from Gentoo commit 938edbd0f61d2d0d9444528bb9d75029d4661ab3.
@krnowak krnowak requested a review from a team July 2, 2025 10:31
@krnowak krnowak moved this to ✅ Testing / in Review in Flatcar tactical, release planning, and roadmap Jul 2, 2025
@krnowak krnowak marked this pull request as ready for review July 2, 2025 10:32
@krnowak
Copy link
Member

krnowak commented Jul 2, 2025

CI passed.

Copy link
Author

github-actions bot commented Jul 2, 2025

Build action triggered: https://github.com/flatcar/scripts/actions/runs/16024043138

Copy link
Contributor

@chewi chewi left a comment

Choose a reason for hiding this comment

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

I don't fully understand the mksquashfs changes, and I don't think CI tests PXE. Please do whatever manual testing you think is necessary there.

@krnowak
Copy link
Member

krnowak commented Jul 2, 2025

I don't fully understand the mksquashfs changes, and I don't think CI tests PXE. Please do whatever manual testing you think is necessary there.

The said squashfs image has contents of /usr directory, so the image's toplevel directories are lib, lib64, share and so on. The first fix was to change /usr/share/flatcar/update.conf to /share/flatcar/update.conf. Otherwise mksquashfs started complaining that usr directory does not exists in the image, so some of the pseudofiles won't be installed.

Second fix is still related to the same file. It already exists in the image, so the pseudofile wanting to be installed there won't be, because mksquashfs stopped liking overwriting the files already present in the image. Which is why I added -e share/flatcar/update.conf - mksquashfs won't copy that file into the image, so that pseudofile can be created there. It was actually a suggestion printed by mksquashfs. :)

I'll add these explanations to the commit message.

And I think pxe stuff is tested by equinix metal, so I'll kick off a test for that platform to be sure.

@chewi
Copy link
Contributor

chewi commented Jul 2, 2025

That all make sense, thank you, and I think you're right about EM.

The pxe disk is a cpio file that, among other things, contains a
squashfs image.

The image has contents of `/usr` directory, so the image's toplevel
directories are `lib`, `lib64`, `share` and so on. The first fix was
to change the `/usr/share/flatcar/update.conf` path in pseudofile
listing to `/share/flatcar/update.conf`. Otherwise mksquashfs started
complaining that `usr` directory does not exists in the image, so some
of the pseudofiles won't be installed.

Second fix is still related to the same file. It already exists in the
image, so the pseudofile wanting to be installed there won't be,
because mksquashfs stopped liking overwriting the files already
present in the image. I added `-e share/flatcar/update.conf` to avoid
adding the file into the image, so that pseudofile can be created
there. It was actually a suggestion printed by mksquashfs.
@krnowak krnowak force-pushed the buildbot/weekly-portage-stable-package-updates-2025-06-30 branch from b8e92ca to c022d43 Compare July 2, 2025 11:34
@krnowak
Copy link
Member

krnowak commented Jul 2, 2025

CI is still running for equinix metal, but some tests already passed, so we know that the image boots just fine.

@krnowak krnowak merged commit 0cbc3dc into main Jul 2, 2025
2 of 4 checks passed
@github-project-automation github-project-automation bot moved this from ✅ Testing / in Review to Implemented in Flatcar tactical, release planning, and roadmap Jul 2, 2025
@krnowak krnowak deleted the buildbot/weekly-portage-stable-package-updates-2025-06-30 branch July 2, 2025 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Development

Successfully merging this pull request may close these issues.

2 participants