fix: remove override_glibc logic from libxcrypt

christopherco commented 3 months ago

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

[ ] The toolchain has been rebuilt successfully (or no changes were made to it)
[ ] The toolchain/worker package manifests are up-to-date
[ ] Any updated packages successfully build (or no packages were changed)
[ ] Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
[ ] Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
[ ] All package sources are available
[ ] cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
[ ] LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
[ ] All source files have up-to-date hashes in the *.signatures.json files
[ ] sudo make go-tidy-all and sudo make go-test-coverage pass
[ ] Documentation has been updated to match any changes to the build system
[ ] If you are adding/removing a .spec file that has multiple-versions supported, please add @microsoft/cbl-mariner-multi-package-reviewers team as reviewer (Eg. golang has 2 versions 1.18, 1.21+)
[ ] Ready to merge

Summary

Now that glibc no longer builds libcrypt.so, we can directly use libxcrypt's version of libcrypt.so and remove the override macros in the libxcrypt spec.

The override_glibc logic was added by us to workaround an issue with adding this improved version of libcrypt into Mariner 1.0 while it was already released. And in 1.0, 2.0, and pre-Nov 2023 3.0, the macro was %bcond_without override_glibc, but after Nov 2023, the macro was changed to %bcond_with override_glibc which means all these overrides are currently inert and are now just diffs from the original spec.

The only real functional change here is the addition of Requires: glibc%{?_isa} >= %{glibc_minver}

Signed-off-by: Chris Co chrco@microsoft.com

Does this affect the toolchain?

YES

Associated issues

https://microsoft.visualstudio.com/OS/_workitems/edit/47158360

Test Methodology

Pipeline build id: 592855

anphel31 commented 3 months ago

Looks good, but can we run a toolchain build for extra validation? The buddybuild environment is slightly different. (you might need to push a branch to this repo to run the toolchain build)

christopherco commented 3 months ago

Looks good, but can we run a toolchain build for extra validation? The buddybuild environment is slightly different. (you might need to push a branch to this repo to run the toolchain build)

Of course! Queued the toolchain build - https://dev.azure.com/mariner-org/mariner/_build/results?buildId=593711&view=results

christopherco commented 3 months ago

Toolchain and RPM builds passed:

microsoft / azurelinux