Support Debian DKMS builds #7554
Merged
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## master #7554 +/- ##
==========================================
- Coverage 77.49% 77.34% -0.16%
==========================================
Files 336 336
Lines 107529 107529
==========================================
- Hits 83329 83164 -165
- Misses 24200 24365 +165
Continue to review full report at Codecov.
|
This was referenced May 23, 2018
scripts/dkms.mkconf calls configure with
`--with-linux=${kernel_source_dir}`, but Debian puts it kernel source at
`/lib/modules/<version>/source`. This patch adds the same logic to the
DKMS file produced by `scripts/dkms.mkconf` that Debian has shipped in
its official ZFS packaging: at DKMS build time, it checks if the system
is a Debian system, and adjusts the path accordingly.
Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
Closes openzfs#7358 openzfs#7540
aerusso
force-pushed
the
pulls/dkms-build-support-debian
branch
from
7414d47
to
3de0498
Compare
|
@aerusso I'm going to go ahead and merge this since it clearly addresses the intended issue. We can follow with additional fixes as needed. |
gmelikov
approved these changes
May 26, 2018
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 15, 2018
scripts/dkms.mkconf calls configure with
`--with-linux=${kernel_source_dir}`, but Debian puts it kernel source at
`/lib/modules/<version>/source`. This patch adds the same logic to the
DKMS file produced by `scripts/dkms.mkconf` that Debian has shipped in
its official ZFS packaging: at DKMS build time, it checks if the system
is a Debian system, and adjusts the path accordingly.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
Closes openzfs#7358
Closes openzfs#7540
Closes openzfs#7554
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 23, 2018
scripts/dkms.mkconf calls configure with
`--with-linux=${kernel_source_dir}`, but Debian puts it kernel source at
`/lib/modules/<version>/source`. This patch adds the same logic to the
DKMS file produced by `scripts/dkms.mkconf` that Debian has shipped in
its official ZFS packaging: at DKMS build time, it checks if the system
is a Debian system, and adjusts the path accordingly.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
Closes openzfs#7358
Closes openzfs#7540
Closes openzfs#7554
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Sep 5, 2018
scripts/dkms.mkconf calls configure with
`--with-linux=${kernel_source_dir}`, but Debian puts it kernel source at
`/lib/modules/<version>/source`. This patch adds the same logic to the
DKMS file produced by `scripts/dkms.mkconf` that Debian has shipped in
its official ZFS packaging: at DKMS build time, it checks if the system
is a Debian system, and adjusts the path accordingly.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
Closes openzfs#7358
Closes openzfs#7540
Closes openzfs#7554
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
scripts/dkms.mkconfcallsconfigurewith--with-linux=${kernel_source_dir}, but Debian puts it kernel source at/lib/modules/<version>/source. This patch adds the same logic to the DKMS file produced byscripts/dkms.mkconfthat Debian has shipped in its official ZFS packaging: at DKMS build time, it checks if the system is a Debian system, and adjusts the path accordingly.Motivation and Context
This should address the build failures in #7358 and #7540.
How Has This Been Tested?
I've built and installed the DKMS package from this on a machine.
Types of changes
Checklist:
Signed-off-by.