Migrate (almost) all versioned coreos-overlay ebuilds away from git eclass #3612
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also use upstream's vendor tarball. Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Note that 9999 does not currently build. Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
It was pinned to an old commit. I will maintain the new Gentoo package. Signed-off-by: James Le Cuirot <[email protected]>
Signed-off-by: James Le Cuirot <[email protected]>
flatcar_workon creates a temporary PORTAGE_TMPDIR. It's probably a good idea for an SDK in general anyway. Signed-off-by: James Le Cuirot <[email protected]>
This was left over from the cros_workon migration. Signed-off-by: James Le Cuirot <[email protected]>
Member
|
CI results http://jenkins.infra.kinvolk.io:8080/job/container/job/sdk/2439/cldsv/ disappeared, because > 1 week passed. It looks good, at least for rust-based projects, afterburn, update-ssh-keys, ue-rs. |
2 tasks
cjp256
reviewed
Jan 9, 2026
| inherit git-r3 | ||
| else | ||
| EGIT_COMMIT="ee644fc60a32af5fbc4e83c64fcc7ca0eadb9e3f" # flatcar-master | ||
| EGIT_VERSION="a1cb1f901971165827d68188e9f60752c0e33c10" # flatcar-master |
There was a problem hiding this comment.
EGIT_ seems a little misleading when not using git-r3?
Contributor
Author
There was a problem hiding this comment.
A little, but it allows us to use the same variable if needing to reference the commit elsewhere, such as in coreos-cloudinit.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Migrate most versioned coreos-overlay ebuilds away from git
We want to have static tarballs for all our keyworded versioned ebuilds, just like Gentoo does, for better reproducibility and caching. This stops using git-r3.eclass for those ebuilds.
Note that I've used
EGIT_VERSIONto reference the commit we're fetching a tarball for. This variable is normally set by git-r3.eclass to the commit that was fetched. This allows us to use the same variable in version strings, if necessary. coreos-cloudinit has an example of this.Be aware that GitHub archive downloads are susceptible to change over time. However, myself and most other Gentoo developers use them all the time with practically no fallout because the mirrors hide the issue. That should be the case for us too. If the files do change, it's not the end of the world. Fixing that would be less work than creating our own tarballs.
app-containers/accelerated-container-image and sys-fs/overlaybd haven't been dealt with yet because they also download things during the actual build, which is hairy. One for later.
coreos-base/afterburn was a slightly special case. It was downloading all the crates using
SRC_URI, but now it uses upstream's vendor tarball. It still needs to download the hostname crate though due to a patch.app-emulation/open-vmdk was another special case. This was pinned to a 2-year-old commit even though there have been many releases since. I have added the package to Gentoo instead, and I will maintain it there.
I took the opportunity to also freshen up the ebuilds a little, so that they now almost entirely pass
pkgcheck scan.How to use
Build an SDK and an image.
Testing done
A Jenkins run for all platforms mostly passed. Azure kept failing the open-iscsi test on arm64 for some reason. qemu_uefi_secure on amd64 repeatedly blew up with scary KVM host errors! I doubt either are related.
I also manually tested building each package locally, both from the versioned and the live ebuilds.
changelog/directory (user-facing change, bug fix, security fix, update) -- N/A/bootand/usrsize, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.