Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kmodtool: depmod path #9310

Merged
merged 1 commit into from Sep 11, 2019
Merged

kmodtool: depmod path #9310

merged 1 commit into from Sep 11, 2019

Conversation

behlendorf
Copy link
Contributor

@behlendorf behlendorf commented Sep 10, 2019

Motivation and Context

Proposed alternative to #9293 to resolve #8724.

Description

Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod. Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself. For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

How Has This Been Tested?

Locally compiled, pending CI results. Manually tested on RHEL 8.

package install
$ sudo dnf localinstall *.x86_64.rpm
Last metadata expiration check: 1:17:26 ago on Tue 10 Sep 2019 09:11:35 PM UTC.
Dependencies resolved.
=================================================================================================================================================
 Package                                                   Arch              Version                               Repository               Size
=================================================================================================================================================
Installing:
 kmod-zfs-4.18.0-80.11.1.el8_0.x86_64                      x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            1.2 M
 kmod-zfs-4.18.0-80.11.1.el8_0.x86_64-debuginfo            x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline             10 M
 kmod-zfs-devel                                            x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            350 k
 kmod-zfs-devel-4.18.0-80.11.1.el8_0.x86_64                x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline             30 k
 libnvpair1                                                x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline             37 k
 libnvpair1-debuginfo                                      x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline             87 k
 libuutil1                                                 x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline             31 k
 libuutil1-debuginfo                                       x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline             55 k
 libzfs2                                                   x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            213 k
 libzfs2-debuginfo                                         x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            493 k
 libzfs2-devel                                             x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            364 k
 libzpool2                                                 x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            885 k
 libzpool2-debuginfo                                       x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            2.2 M
 zfs                                                       x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            508 k
 zfs-debuginfo                                             x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            845 k
 zfs-debugsource                                           x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            2.0 M
 zfs-kmod-debugsource                                      x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            1.8 M
 zfs-test                                                  x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            3.1 M
 zfs-test-debuginfo                                        x86_64            0.8.0-265_g6c4e4ad69.el8              @commandline            275 k

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Fixes openzfs#8724
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Sep 10, 2019
@codecov
Copy link

codecov bot commented Sep 11, 2019

Codecov Report

Merging #9310 into master will decrease coverage by 0.13%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9310      +/-   ##
==========================================
- Coverage   79.19%   79.06%   -0.14%     
==========================================
  Files         401      401              
  Lines      122071   122071              
==========================================
- Hits        96679    96513     -166     
- Misses      25392    25558     +166
Flag Coverage Δ
#kernel 79.73% <ø> (-0.01%) ⬇️
#user 66.81% <ø> (-0.5%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6122948...6c4e4ad. Read the comment docs.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Sep 11, 2019
@behlendorf behlendorf merged commit 5b51c15 into openzfs:master Sep 11, 2019
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 17, 2019
Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8724
Closes openzfs#9310
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8724
Closes openzfs#9310
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8724
Closes openzfs#9310
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 18, 2019
Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8724
Closes openzfs#9310
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 19, 2019
Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8724
Closes openzfs#9310
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 23, 2019
Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#8724
Closes openzfs#9310
tonyhutter pushed a commit that referenced this pull request Sep 26, 2019
Determine the location of depmod on the system, either /sbin/depmod or
/usr/sbin/depmod.  Then use that path when generating the specfile.

Additionally, update the Requires lines to reference the package which
provides depmod rather than the binary itself.  For CentOS/RHEL 7+8
and all supported Fedora releases this is the kmod package, and for
CentOS/RHEL 6 it is the module-init-tools package.

Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8724
Closes #9310
@behlendorf behlendorf deleted the issue-8724 branch April 19, 2021 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0.8.0 Does not install on RHEL 8 (depmod change)
3 participants