Properly embed EnvironmentFile and unify meson and autoconf build env #344
Conversation
This file contains hidden or 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
… autonconf Commit 724243f introduced a 2nd environment file. This patch fixes that both files are optional. There should be one mandatory EnvironmentFile provided by package install as before which lives in e.g. /usr/lib and one optional one that users/admins can place into /etc/... Before the replacement of both EnvironmentFile directives was fragile, e.g. a spec file's sed could easily result in overwriting both EnvironmentFile occurences silently pointing to the same location. This patch properly integrates the paths into meson and autoconf by introducing 2 configurable directories, defaults set to: /usr/etc/default for the mandatory, package provided config file and /etc/default for the optional admin override conf file. It renames misc/irqbalance.service to misc/irqbalance.service.in and replaces the paths via AC_SUBST/AC_CONFIG_FILES (autoconf) or configure_file (meson) via pkgconfdir and usrconfdir introduced configure/setup options: +EnvironmentFile=@pkgconfdir@/irqbalance.env +EnvironmentFile=-@usrconfdir@/irqbalance irqbalance.service is now installed via autoconf/meson, by trying to fetch systemd's unitdir via pkgconfig.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Having two EnvironmentFile key words to get replace due to a recent irqbalance.service change, got silently wrong by an sed replacement of config paths...
These 2 patches unify and enhance the meson and autoconf build setup and make the 2 EnvironmentFile directories configurable.