toolchain: Bootstrap raw toolchain with systemd RPM macro definitions #2873
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.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
./cgmanifest.json
,./toolkit/tools/cgmanifest.json
,./toolkit/scripts/toolchain/cgmanifest.json
,.github/workflows/cgmanifest.json
)./SPECS/LICENSES-AND-NOTICES/data/licenses.json
,./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
,./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON
)*.signatures.json
filessudo make go-tidy-all
andsudo make go-test-coverage
passSummary
The
audit
package was recently added to the toolchain in #2416. Theaudit
package usessystemd
macros to handle service management. This was fine whenaudit
was outside the toolchain, sincesystemd-bootstrap-rpm-macros
is in the worker chroot and thesystemd
macros expand just fine at build-time.However, the raw toolchain does not have any
systemd
macros defined. So, specs in the toolchain can't usesystemd
macros since they can't expand into a proper scriptlet at build-time. This causes scriptlet failures when upgrading theaudit
package.So, let's bootstrap the raw toolchain with the
systemd
RPM macros! This PR adds themacros.systemd
file from thesystemd-rpm-macros
package as part of the raw toolchain. This file gets downloaded like any other toolchain source and is installed into the RPM macros directory when building the raw toolchain.TODO: Need to add a note to
systemd.spec
about updating the toolchain macro file when upgrading that packageChange Log
Does this affect the toolchain?
YES
Associated issues
tdnf update -y
fails: Error(1525) : rpm transaction failed #2858Test Methodology
audit-libs
RPM has expandedsystemd
macros in its scriptlets.