Migrate from glibc libcrypt to sys-libs/libxcrypt #1732
Merged
Conversation
This file contains 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
|
CI passed. |
|
Build action triggered: https://github.com/flatcar/scripts/actions/runs/9205546007 |
2 tasks
|
Can you please rebase and run Jenkins CI again? |
It's from Gentoo commit 5719c8e719b916e754090c74aaed74634a28ad9b.
It's long overdue and glibc 2.39 will drop crypt stuff altogether. Or so I heard. Whatever happens, the crypt library in glibc is deprecated for a long time already.
Stage1 hooks will receive a path to a file as a third parameter. They can use it to tell the bootstrap script to set up catalyst to perform updates on seed SDK. Contents of the file are ignored - what counts is that the file exists AND is not empty.
They are copying sys-libs/libxcrypt from new portage-stable and updating package masks and USE flags in order to migrate from glibc-provided libcrypt to libxcrypt-provided libcrypt. The migration seems to be a bit complicated to do, because bootstrapping a system using glibc with libxcrypt-provided libcrypt using a build environment using glibc with glibc-provided libcrypt results in some slot conflicts. Without the stage1 hooks the failure happened in stage2. With the hooks, but without the seed SDK update, the failure happened already in stage1. Updating the seed SDK to use libxcrypt seems to do the trick. The update of the seed SDK will happen only when transition happens - if the seed SDK is already using libxcrypt, these hooks are noops.
|
Rebased, CI kicked off. |
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.
This ought to be done long time ago, as the glibc crypt functionality is deprecated since 2.30 or 2.33 or so. The sys-libs/libxcrypt provides the replacement. Glibc crypt stuff is supposed to be dropped in 2.39, so really soon. We are using 2.38 at the moment.
I think I punted the migration because I was getting some dependency loop issues (dev-lang/python -> virtual/crypt -> sys-libs/libxcrypt -> sys-libs/glibc -> dev-lang/python). Let's see how it goes now.
CI: http://jenkins.infra.kinvolk.io:8080/job/container/job/sdk/1474/cldsv/