azurelinux
azurelinux copied to clipboard
kernel-rt: Add kernel conflicts and produce specialized versions of b…
…pftool and python3-perf
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
- [x] The toolchain has been rebuilt successfully (or no changes were made to it)
- [x] 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,
*-staticsubpackages, etc.) have had theirReleasetag incremented. - [ ] Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
- [x] All package sources are available
- [x] cgmanifest files are up-to-date and sorted (
./cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json) - [x] 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) - [x] All source files have up-to-date hashes in the
*.signatures.jsonfiles - [ ]
sudo make go-tidy-allandsudo make go-test-coveragepass - [ ] Documentation has been updated to match any changes to the build system
- [ ] Ready to merge
Summary
Both SPECS/kernel and SPECS-EXTENDED/kernel-rt packages contain sub-packages named python3-perf and bpftool. Therefore, the RPMs those subpackages that were built against kernel-rt were replacing the RPMs built against kernel in PMC.
This PR disambiguates the RPMs built against the mainline kernel from those built against the RT kernel kernel-rt by adding a suffix -rt to those pkgs.
Change Log
- Rename
bpftoolandpython3-perfto be kernel specific in thekernel-rtspec - Add new requires for
bpftool-rtandpython3-perf-rtforkernel-rt - Update dependency in
tunedfrompython3-perftopython3-perf-rt
Does this affect the toolchain?
YES/NO
Test Methodology
- Buddy Build Pipeline build: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=631511&view=results