Unload igb module when igb_avb is loaded

[TIVI-2943] : As mentioned in README of igb_avb project,
igb needs to be unloaded before igb_avb is loaded.
(https://github.com/intel-ethernet/Open-AVB/blob/master/kmod/igb/README)

Change-Id: Iffc562e454b625186f83870922c8caec342bb64c
Signed-off-by: Jin Song <jin.kyu.song@linux.intel.com>

diff --git a/packaging/igb_avb.conf b/packaging/igb_avb.conf
new file mode 100644 (file)
index 0000000..4b32acc
--- /dev/null
+++ b/packaging/igb_avb.conf
@@ -0,0 +1 @@
+install igb_avb /sbin/modprobe -r igb;/sbin/modprobe --ignore-install igb_avb

diff --git a/packaging/openavb.spec b/packaging/openavb.spec
index ea55984..d7b8b5b 100644 (file)
--- a/packaging/openavb.spec
+++ b/packaging/openavb.spec
@@ -98,11 +98,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libigb.la
 
 # Install systemd and sample 'configuration' files.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
-    $RPM_BUILD_ROOT/lib/systemd/system
+    $RPM_BUILD_ROOT/lib/systemd/system \
+    %{buildroot}/%{_sysconfdir}/modprobe.d
 /usr/bin/install -m 644 packaging/openavb.env \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openavb
 /usr/bin/install -m 644 -t $RPM_BUILD_ROOT/lib/systemd/system \
     packaging/mrpd.service packaging/gptp.service
+/usr/bin/install -m 644 packaging/igb_avb.conf \
+    %{buildroot}/%{_sysconfdir}/modprobe.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,6 +131,7 @@ depmod -a %{kernel_moddir}
 %files kmod-igb
 %defattr(-,root,root,-)
 %{kernel_modpath}/kernel/drivers/net/igb_avb
+%config(noreplace)%{_sysconfdir}/modprobe.d/igb_avb.conf
 
 %files libigb
 %defattr(-,root,root,-)