sis190 and sis900 for el7

elrepo · May 1, 2018 · 502b5e4 · 502b5e4
1 parent c4418dd
commit 502b5e4
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 1,988 deletions.
diff --git a/sis190-kmod/el7/Makefile b/sis190-kmod/el7/Makefile
diff --git a/sis190-kmod/el7/kmodtool-sis190-el7.sh b/sis190-kmod/el7/kmodtool-sis190-el7.sh
@@ -155,6 +155,7 @@ Provides:         kernel-modules >= ${verrel_dep}${dotvariant}
 Provides:         ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires(post):   /usr/sbin/depmod
 Requires(postun): /usr/sbin/depmod
+Requires:         kernel >= 3.10.0-862.el7
 EOF
 
     if [ "yes" != "$nobuildreqs" ]

diff --git a/sis190-kmod/el7/sis190-kmod.spec b/sis190-kmod/el7/sis190-kmod.spec
@@ -2,11 +2,11 @@
 %define kmod_name sis190
 
 # If kversion isn't defined on the rpmbuild line, define it here.
-%{!?kversion: %define kversion 3.10.0-123.el7.%{_target_cpu}}
+%{!?kversion: %define kversion 3.10.0-862.el7.%{_target_cpu}}
 
 Name:    %{kmod_name}-kmod
 Version: 1.4
-Release: 1%{?dist}
+Release: 1.el7_5.elrepo
 Group:   System Environment/Kernel
 License: GPLv2
 Summary: %{kmod_name} kernel module(s)
@@ -21,6 +21,9 @@ Source0:  %{kmod_name}-%{version}.tar.gz
 Source5:  GPL-v2.0.txt
 Source10: kmodtool-%{kmod_name}-el7.sh
 
+# Patches.
+Patch1:  sis190-rh75.patch
+
 # Magic hidden here.
 %{expand:%(sh %{SOURCE10} rpmtemplate %{kmod_name} %{kversion} "")}
 
@@ -36,6 +39,8 @@ of the same variant of the Linux kernel and not on any one specific build.
 %setup -q -n %{kmod_name}-%{version}
 echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf
 
+%patch1 -p1
+
 %build
 KSRC=%{_usrsrc}/kernels/%{kversion}
 %{__make} -C "${KSRC}" %{?_smp_mflags} modules M=$PWD
@@ -66,6 +71,10 @@ done
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Thu Apr 12 2018 Akemi Yagi <toracat@elrepo.org> - 1.4-1.el7_5
+- Rebuilt against RHEL 7.5 kernel
+- Patch added to fix build errors
+
 * Thu Oct 09 2014 Akemi Yagi <toracat@elrepo.org> - 1.4-1
 - Initial el7 build of the kmod package
 - Backported from kernel-3.10.57
diff --git a/sis190-kmod/el7/sis190-rh75.patch b/sis190-kmod/el7/sis190-rh75.patch
@@ -0,0 +1,16 @@
+ELRepo patch sis190-rh75.patch
+
+Original patch, ethernetbuild_v4.diff, was written by pgreco to fix build
+errors for centosplus kernel 7.5.
+
+--- a/sis190.c	2014-10-09 12:18:54.000000000 -0700
++++ b/sis190.c	2018-04-12 17:01:20.365476537 -0700
+@@ -1836,7 +1836,7 @@ static const struct net_device_ops sis19
+ 	.ndo_start_xmit		= sis190_start_xmit,
+ 	.ndo_tx_timeout		= sis190_tx_timeout,
+ 	.ndo_set_rx_mode	= sis190_set_rx_mode,
+-	.ndo_change_mtu		= eth_change_mtu,
++	.ndo_change_mtu_rh74		= eth_change_mtu,
+ 	.ndo_set_mac_address	= sis190_mac_addr,
+ 	.ndo_validate_addr	= eth_validate_addr,
+ #ifdef CONFIG_NET_POLL_CONTROLLER