upd

4 files changed, 7 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ea51e528cfc..f999f6cfc513 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = e1000e-dkms
 	pkgdesc = Intel e1000e Ethernet adapter driver (latest version from Intel) (DKMS version)
 	pkgver = 3.8.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sourceforge.net/projects/e1000/
 	install = e1000e-dkms.install
 	arch = any
@@ -12,10 +12,8 @@ pkgbase = e1000e-dkms
 	optdepends = linux-lts-headers: build the module against LTS Arch kernel [requires at least one set of kernel headers]
 	source = http://downloads.sourceforge.net/project/e1000/e1000e%20stable/3.8.4/e1000e-3.8.4.tar.gz
 	source = dkms.conf.in
-	source = build-fix.patch
 	sha256sums = 4441515302f901e32f29b9b4702239f176d3c02c3b9a697009f93012205e0de1
-	sha256sums = 635b6c312c18db94e852248e0f5a1238e179ef1c0ebba2cdd0983afdb56efaf4
-	sha256sums = d30c5d46d9f9b5e9c7ddcb3bd21303f585e04545571156fe3130d9f72922d0e0
+	sha256sums = ebf49307a6773034c551755238221b36b0bd88990f897bf80716ec8e0c95b029
 
 pkgname = e1000e-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cdc1c788ae1..e59768b3a8c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Michael Brock <velo dot mcb at gmail dot com>
 #
 # adapted from package "e1000e-dkms"
+
 pkgname=e1000e-dkms
 _modname=e1000e
 pkgver=3.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel e1000e Ethernet adapter driver (latest version from Intel) (DKMS version)"
 license=('GPL')
 arch=('any')
@@ -15,21 +16,14 @@ optdepends=('linux-headers: build the module against Arch kernel [requires at le
 install=e1000e-dkms.install
 url='http://sourceforge.net/projects/e1000/'
 source=("http://downloads.sourceforge.net/project/e1000/${_modname}%20stable/${pkgver}/${_modname}-${pkgver}.tar.gz"
-        'dkms.conf.in'
-        'build-fix.patch')
+        'dkms.conf.in')
 sha256sums=('4441515302f901e32f29b9b4702239f176d3c02c3b9a697009f93012205e0de1'
-            '635b6c312c18db94e852248e0f5a1238e179ef1c0ebba2cdd0983afdb56efaf4'
-            'd30c5d46d9f9b5e9c7ddcb3bd21303f585e04545571156fe3130d9f72922d0e0')
-
-prepare() {
-  cd ${srcdir}/${_modname}-${pkgver}
-#  patch -p1 <"$srcdir"/build-fix.patch
-}
+            'ebf49307a6773034c551755238221b36b0bd88990f897bf80716ec8e0c95b029')
 
 package() {
   cd ${srcdir}/${_modname}-${pkgver}
   install -dm755 "${pkgdir}/usr/src/${_modname}-${pkgver}/"
-  for i in "${srcdir}/${_modname}-${pkgver}/src/"{Makefile,*.c,*.h}; do
+  for i in "${srcdir}/${_modname}-${pkgver}/src/"*; do
     install -D -m644 "${i}" "${pkgdir}/usr/src/${_modname}-${pkgver}/"
   done
   sed "s/#MODULE_VERSION#/${pkgver}/" "${srcdir}/dkms.conf.in" > "${pkgdir}/usr/src/${_modname}-${pkgver}/dkms.conf"
diff --git a/build-fix.patch b/build-fix.patch
deleted file mode 100644
index 4a1cecd9ec56..000000000000
--- a/build-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur e1000e-3.3.5.10.org/src/Makefile e1000e-3.3.5.10/src/Makefile
---- e1000e-3.3.5.10.org/src/Makefile	2017-06-18 11:08:08.000000000 +0300
-+++ e1000e-3.3.5.10/src/Makefile	2017-08-21 20:08:41.961879873 +0300
-@@ -76,11 +76,7 @@
- endif
- 
- # Version file Search Path
--VSP :=  $(KOBJ)/include/generated/utsrelease.h \
--        $(KOBJ)/include/linux/utsrelease.h \
--        $(KOBJ)/include/linux/version.h \
--        $(KOBJ)/include/generated/uapi/linux/version.h \
--        /boot/vmlinuz.version.h
-+VSP :=  $(KOBJ)/include/generated/uapi/linux/version.h
- 
- # Config file Search Path
- CSP :=  $(KOBJ)/include/generated/autoconf.h \
-@@ -124,19 +120,6 @@
- # we need to know what platform the driver is being built on
- # some additional features are only built on Intel platforms
- ARCH := $(shell uname -m | sed 's/i.86/i386/')
--ifeq ($(ARCH),alpha)
--  EXTRA_CFLAGS += -ffixed-8 -mno-fp-regs
--endif
--ifeq ($(ARCH),x86_64)
--  EXTRA_CFLAGS += -mcmodel=kernel -mno-red-zone
--endif
--ifeq ($(ARCH),ppc)
--  EXTRA_CFLAGS += -msoft-float
--endif
--ifeq ($(ARCH),ppc64)
--  EXTRA_CFLAGS += -m64 -msoft-float
--  LDFLAGS += -melf64ppc
--endif
- 
- # extra flags for module builds
- EXTRA_CFLAGS += -DDRIVER_$(shell echo $(DRIVER_NAME) | tr '[a-z]' '[A-Z]')
diff --git a/dkms.conf.in b/dkms.conf.in
index 502c541c1af9..bff7ed69d691 100644
--- a/dkms.conf.in
+++ b/dkms.conf.in
@@ -1,6 +1,5 @@
 PACKAGE_NAME="e1000e"
 PACKAGE_VERSION="#MODULE_VERSION#"
-MAKE[0]="make KVERSION=$kernelver BUILD_KERNEL=$kernelver"
 CLEAN="make clean"
 BUILT_MODULE_NAME[0]="e1000e"
 DEST_MODULE_LOCATION[0]="/updates"