sys-apps/nvme-cli: Install udev rules and systemd units in correct pl…#31159
Closed
krnowak wants to merge 1 commit intogentoo:masterfrom
Closed
sys-apps/nvme-cli: Install udev rules and systemd units in correct pl…#31159krnowak wants to merge 1 commit intogentoo:masterfrom
krnowak wants to merge 1 commit intogentoo:masterfrom
Conversation
5 tasks
Pull Request assignmentSubmitter: @krnowak sys-apps/nvme-cli: @gentoo/base-system Linked bugsNo bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment. If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers. Missing GCO sign-offPlease read the terms of Gentoo Certificate of Origin and acknowledge them by adding a sign-off to all your commits. In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
…aces Udev rules should be installed in rules.d directory (so in `/usr/lib/udev/rules.d`), currently they are installed in `/usr/lib/udev`. This mistake probably comes from a build system change, where for old build system (in version 1.16), UDEVDIR was supposed to be specified, and the build system defined UDEVRULESDIR based on the former (see https://github.com/linux-nvme/nvme-cli/blob/v1.16/Makefile#L17-L18). The new build system expects the udev rules directory to be passed as a parameter. Similar mistake happened for the systemd unit directory - the systemd unit files are installed in `/usr/lib/systemd/system`, not in `/usr/lib/systemd`. This one stems from a change in meaning of the `systemddir` option in the build system - in the old build system it meant to be `/usr/lib/systemd` and the `system` subdirectory was appended by the old build system when installing the units (see https://github.com/linux-nvme/nvme-cli/blob/v1.16/Makefile#L142-L144). The new build system does not do it any more - it just installs the units to `systemddir` (see https://github.com/linux-nvme/nvme-cli/blob/v1.16/Makefile#L142-L144), thus making the `systemddir` option name rather misleading - probably should be named `systemdunitdir`, as `systemddir` is not used for anything else (see https://github.com/linux-nvme/nvme-cli/blob/v2.4/Makefile#L49). Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
a8b5ccc to
261648a
Compare
Contributor
Author
|
Argh, fixed the signoff. |
floppym
approved these changes
May 25, 2023
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
…aces
This popped up when we updated the package in Flatcar - we used to have 1.16 and, after updating to 2.3, some files changed their locations. This PR tries to fix it. The diff between the nvme-cli-2.4-r{1,2} ebuilds is:
Udev rules should be installed in rules.d directory (so in
/usr/lib/udev/rules.d), currently they are installed in/usr/lib/udev. This mistake probably comes from a build system change, where for old build system (in version 1.16), UDEVDIR was supposed to be specified, and the build system defined UDEVRULESDIR based on the former (seehttps://github.com/linux-nvme/nvme-cli/blob/v1.16/Makefile#L17-L18). The new build system expects the udev rules directory to be passed as a parameter.
Similar mistake happened for the systemd unit directory - the systemd unit files are installed in
/usr/lib/systemd/system, not in/usr/lib/systemd. This one stems from a change in meaning of thesystemddiroption in the build system - in the old build system it meant to be/usr/lib/systemdand thesystemsubdirectory was appended by the old build system when installing the units (see https://github.com/linux-nvme/nvme-cli/blob/v1.16/Makefile#L142-L144). The new build system does not do it any more - it just installs the units tosystemddir(seehttps://github.com/linux-nvme/nvme-cli/blob/v1.16/Makefile#L142-L144), thus making the
systemddiroption name rather misleading - probably should be namedsystemdunitdir, assystemddiris not used for anything else (seehttps://github.com/linux-nvme/nvme-cli/blob/v2.4/Makefile#L49).