Skip to content

mock: backport upstream change for disabling ca-trust copying#13706

Merged
reubeno merged 1 commit intomicrosoft:3.0-devfrom
reubeno:backport-mock-change
May 13, 2025
Merged

mock: backport upstream change for disabling ca-trust copying#13706
reubeno merged 1 commit intomicrosoft:3.0-devfrom
reubeno:backport-mock-change

Conversation

@reubeno
Copy link
Copy Markdown
Member

@reubeno reubeno commented May 7, 2025

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 (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/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
  • Ready to merge

Summary

Backports to AZL3.0 an upstream mock change to fix runtime errors we've seen using mock to build Azure Linux 3.0 RPMs that have a build-time requirement on ca-certificates. The change allows us to disable mock from copying ca-trust dirs from the host system into the build root; this let us work around problems on an Azure Linux 3.0 host due to symlinks under /etc/pki/ca-trust causing conflicts within the build root.

More details can be found on the upstream change: rpm-software-management/mock#1573.

Change Log

Ports the linked PR to the version of mock in Azure Linux 3.0.

Does this affect the toolchain?

No

Test Methodology

Local build + buddy build

@microsoft-github-policy-service microsoft-github-policy-service Bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels May 7, 2025
@reubeno reubeno marked this pull request as ready for review May 8, 2025 20:21
@reubeno reubeno requested a review from a team as a code owner May 8, 2025 20:21
Comment thread SPECS/mock/mock.spec
@reubeno reubeno merged commit 3e23989 into microsoft:3.0-dev May 13, 2025
16 checks passed
@reubeno reubeno deleted the backport-mock-change branch May 13, 2025 19:52
AkarshHCL pushed a commit to AkarshHCL/azurelinux that referenced this pull request Jul 31, 2025
SumitJenaHCL pushed a commit to SumitJenaHCL/azurelinux that referenced this pull request Aug 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants