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

Migrate Fedora based distros to use the standard udev scripts #835

Merged
merged 5 commits into from Oct 13, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
redhat: delete module loading scripts
Migrate Fedora based distros to use the standard udev scripts
provided in kernel-boot/ directory.

Signed-off-by: Honggang Li <honli@redhat.com>
  • Loading branch information
Honggang-LI committed Sep 30, 2020
commit aaf389f4481bfbe093d575d2d5daf767c1ba6ec0
8 changes: 0 additions & 8 deletions redhat/rdma-core.spec
Expand Up @@ -331,13 +331,9 @@ mkdir -p %{buildroot}%{_libexecdir}
mkdir -p %{buildroot}%{_udevrulesdir}
mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
mkdir -p %{buildroot}%{sysmodprobedir}
install -D -m0644 redhat/rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf
install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf
install -D -m0644 redhat/rdma.service %{buildroot}%{_unitdir}/rdma.service
install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
install -D -m0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules
install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf
install -D -m0755 redhat/rdma.kernel-init %{buildroot}%{_libexecdir}/rdma-init-kernel
install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh

# ibacm
Expand Down Expand Up @@ -400,13 +396,11 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
%config(noreplace) %{_sysconfdir}/rdma/modules/opa.conf
%config(noreplace) %{_sysconfdir}/rdma/modules/rdma.conf
%config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf
%config(noreplace) %{_sysconfdir}/rdma/rdma.conf
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
%config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf
%{_unitdir}/rdma-hw.target
%{_unitdir}/rdma-load-modules@.service
%{_unitdir}/rdma.service
%dir %{dracutlibdir}/modules.d/05rdma
%{dracutlibdir}/modules.d/05rdma/module-setup.sh
%{_udevrulesdir}/../rdma_rename
Expand All @@ -416,9 +410,7 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
%{_udevrulesdir}/90-rdma-hw-modules.rules
%{_udevrulesdir}/90-rdma-ulp-modules.rules
%{_udevrulesdir}/90-rdma-umad.rules
%{_udevrulesdir}/98-rdma.rules
%{sysmodprobedir}/libmlx4.conf
%{_libexecdir}/rdma-init-kernel
%{_libexecdir}/mlx4-setup.sh
%{_libexecdir}/truescale-serdes.cmds
%{_sbindir}/rdma-ndd
Expand Down
18 changes: 0 additions & 18 deletions redhat/rdma.conf

This file was deleted.

160 changes: 0 additions & 160 deletions redhat/rdma.kernel-init

This file was deleted.

4 changes: 1 addition & 3 deletions redhat/rdma.modules-setup.sh
Expand Up @@ -11,14 +11,12 @@ depends() {
}

install() {
inst /etc/rdma/rdma.conf
inst /etc/rdma/mlx4.conf
inst /usr/libexec/rdma-init-kernel
inst /usr/libexec/mlx4-setup.sh
inst /usr/lib/modprobe.d/libmlx4.conf
inst_multiple lspci setpci awk sleep
inst_multiple -o /etc/modprobe.d/mlx4.conf
inst_rules 98-rdma.rules 70-persistent-ipoib.rules
inst_rules 70-persistent-ipoib.rules
}

installkernel() {
Expand Down
15 changes: 0 additions & 15 deletions redhat/rdma.service

This file was deleted.

13 changes: 0 additions & 13 deletions redhat/rdma.udev-rules

This file was deleted.