[packages/e1000e] - fix building with linux 3.19 - rel 4

baggins baggins at pld-linux.org
Mon Mar 30 19:58:18 CEST 2015


commit d3d01a2bf057e8f389971150bda73fefe740d8b3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 30 19:58:02 2015 +0200

    - fix building with linux 3.19
    - rel 4

 e1000e.spec      |  4 +++-
 linux-3.19.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/e1000e.spec b/e1000e.spec
index 4fe0e6a..2cbe05f 100644
--- a/e1000e.spec
+++ b/e1000e.spec
@@ -5,7 +5,7 @@
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		rel	3
+%define		rel	4
 %define		pname	e1000e
 Summary:	Intel(R) PRO/1000e driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel® PRO/1000e
@@ -16,6 +16,7 @@ License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
 # Source0-md5:	b8d770160691edd247a90070f45642ce
+Patch0:		linux-3.19.patch
 URL:		http://downloads.sourceforge.net/e1000/
 BuildRequires:	rpm-build-macros >= 1.701
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -86,6 +87,7 @@ EOF\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 cat > src/Makefile <<'EOF'
 obj-m := e1000e.o
diff --git a/linux-3.19.patch b/linux-3.19.patch
new file mode 100644
index 0000000..244d4f7
--- /dev/null
+++ b/linux-3.19.patch
@@ -0,0 +1,11 @@
+--- e1000e-3.1.0.2/src/netdev.c~	2014-06-26 22:13:33.000000000 +0200
++++ e1000e-3.1.0.2/src/netdev.c	2015-03-30 19:57:06.958655445 +0200
+@@ -7126,7 +7126,7 @@
+ #endif /* CONFIG_PM */
+ 
+ #ifndef USE_LEGACY_PM_SUPPORT
+-#ifdef CONFIG_PM_RUNTIME
++#if defined(CONFIG_PM_RUNTIME) || ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) )
+ static int e1000e_pm_runtime_idle(struct device *dev)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(dev);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/e1000e.git/commitdiff/d3d01a2bf057e8f389971150bda73fefe740d8b3



More information about the pld-cvs-commit mailing list