starlingx/kernel
Code Issues Proposed changes

Merge "bnxt_en: Automatically load bnxt_re"

Browse Source
This commit is contained in:
Zuul 2022-04-07 22:45:25 +00:00 committed by Gerrit Code Review
commit c3ca31a024
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel-modules/bnxt_en/centos/bnxt_en.spec
View File

@ -38,6 +38,7 @@ Requires(post): /usr/sbin/depmod
Requires(postun): /usr/sbin/depmod Requires(postun): /usr/sbin/depmod
Source0: netxtreme-%{kmod_name}-%{version}-%{upstream_release}.tar.gz Source0: netxtreme-%{kmod_name}-%{version}-%{upstream_release}.tar.gz
Source1: modprobe.conf
Patch0001: 0001-bnxt_re-Makefile-Adapt-to-mlnx-ofa_kernel-for-Starli.patch Patch0001: 0001-bnxt_re-Makefile-Adapt-to-mlnx-ofa_kernel-for-Starli.patch
Patch0002: 0002-bnxt_en-bnxt_compat.h-Fix-up-a-build-failure.patch Patch0002: 0002-bnxt_en-bnxt_compat.h-Fix-up-a-build-failure.patch
@ -104,6 +105,9 @@ mkdir -p ${dest_dir_bnxt_re}
install -m 744 ${src_dir_bnxt_en} ${dest_dir_bnxt_en} install -m 744 ${src_dir_bnxt_en} ${dest_dir_bnxt_en}
install -m 744 ${src_dir_bnxt_re} ${dest_dir_bnxt_re} install -m 744 ${src_dir_bnxt_re} ${dest_dir_bnxt_re}
install -d %{buildroot}%{_sysconfdir}/modprobe.d
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/modprobe.d/bnxt.conf
### Adapted from i40e ### Adapted from i40e
# Strip the modules(s). # Strip the modules(s).
find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \; find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \;
@ -120,6 +124,7 @@ done
%files %files
%defattr(644,root,root,755) %defattr(644,root,root,755)
/lib/modules/%{kversion}/extra/%{kmod_name}/ /lib/modules/%{kversion}/extra/%{kmod_name}/
%{_sysconfdir}/modprobe.d/bnxt.conf
%post %post
if [ -e "/boot/System.map-%{kversion}" ]; then if [ -e "/boot/System.map-%{kversion}" ]; then

1
kernel-modules/bnxt_en/centos/build_srpm.data
View File

@ -1,5 +1,6 @@
COPY_LIST=" \ COPY_LIST=" \
$PATCHES_BASE/* \ $PATCHES_BASE/* \
$PKG_BASE/files/modprobe.conf \
$STX_BASE/downloads/netxtreme-bnxt_en-1.10.2-220.0.13.0.tar.gz \ $STX_BASE/downloads/netxtreme-bnxt_en-1.10.2-220.0.13.0.tar.gz \
" "

1
kernel-modules/bnxt_en/files/modprobe.conf Normal file
View File

@ -0,0 +1 @@
softdep bnxt_en post: bnxt_re