Remove unnecessary pathing, use upstream files instead

4 files changed, 4 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7fd4ec0145e..2df8aa800bde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Jan 31 18:00:08 UTC 2017
+# Tue Jan 31 18:55:29 UTC 2017
 pkgbase = bbswitch-dkms-git
 	pkgdesc = kernel module allowing to switch dedicated graphics card on Optimus laptops, dkms version
 	pkgver = v0.8.r0.g0c38f97
@@ -16,11 +16,7 @@ pkgbase = bbswitch-dkms-git
 	conflicts = bbswitch
 	conflicts = dkms-bbswitch
 	source = bbswitch::git://github.com/Bumblebee-Project/bbswitch.git#branch=develop
-	source = dkms.conf.in
-	source = makefile_dkms.patch
 	sha256sums = SKIP
-	sha256sums = 6bcdd486de01b8cb4842d94be7b33baa52c9405782bf227102cfa32ed691b8cd
-	sha256sums = a05fb9e528f8d67d9819054d548c74e05e799cc570eddcb4f81a886b6d4d3812
 
 pkgname = bbswitch-dkms-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 432f7b015eed..1555c4c51650 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,30 +17,19 @@ makedepends=('git')
 _gitroot='git://github.com/Bumblebee-Project/bbswitch.git'
 _gitname='bbswitch'
 _gitbranch='develop'
-source=("${_gitname}::${_gitroot}#branch=${_gitbranch}"
-        "dkms.conf.in"
-        "makefile_dkms.patch")
-sha256sums=("SKIP"
-            "6bcdd486de01b8cb4842d94be7b33baa52c9405782bf227102cfa32ed691b8cd"
-            "a05fb9e528f8d67d9819054d548c74e05e799cc570eddcb4f81a886b6d4d3812")
+source=("${_gitname}::${_gitroot}#branch=${_gitbranch}")
+sha256sums=("SKIP")
 
 pkgver() {
     cd "$srcdir/${_gitname}"
     git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
-prepare() {
-    cd "${srcdir}/${_gitname}"
-
-    # patch Makefile to consider KERNELRELEASE
-    patch -p1 < "${srcdir}/makefile_dkms.patch"
-}
-
 build() {
     cd "${srcdir}/${_gitname}"
 
     # create dkms.conf
-    sed -e "s/@PKGVER@/${pkgver}/" < "${srcdir}/dkms.conf.in" > dkms.conf
+    sed -e "s/#MODULE_VERSION#/${pkgver}/" < "dkms/dkms.conf" > dkms.conf
 }
 
 package() {
diff --git a/dkms.conf.in b/dkms.conf.in
deleted file mode 100644
index 664314ab0565..000000000000
--- a/dkms.conf.in
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_NAME="bbswitch"
-PACKAGE_VERSION="@PKGVER@"
-MAKE[0]="make"
-CLEAN="make clean"
-BUILT_MODULE_NAME[0]="bbswitch"
-DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
-AUTOINSTALL="yes"
diff --git a/makefile_dkms.patch b/makefile_dkms.patch
deleted file mode 100644
index 7bece6b3e046..000000000000
--- a/makefile_dkms.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3b43b75b969852ec353a556f9abe5fdc091a6e86 Mon Sep 17 00:00:00 2001
-From: Adrian Bacircea <adrian.bacircea@gmail.com>
-Date: Fri, 31 May 2013 12:43:53 +0300
-Subject: [PATCH] Makefile
-
----
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 9073c91..dd4bd95 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,8 @@
- modname := bbswitch
- obj-m := $(modname).o
- 
--KVERSION := $(shell uname -r)
-+KERNELRELEASE ?= $(shell uname -r)
-+KVERSION = $(KERNELRELEASE)
- KDIR := /lib/modules/$(KVERSION)/build
- PWD := "$$(pwd)"
- 
--- 
-1.8.3
-