fixed environment variables and redundancies

Pretty big oops on my part. Fixed environment variables are:

- KVERSION => KVER
- KDIR => KSRC

Redundancies removed are:

- cd ${srcdir} as we already do this
- local://dkms.conf => ${url}/dkms.conf

Also added prepare() for streamedit ${pkgbase}-${pkgver}/dkms.conf

4 files changed, 18 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eec07316ad11..6029c2502454 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Aug  3 10:34:56 UTC 2017
+# Fri Aug  4 00:17:03 UTC 2017
 pkgbase = rtl8188eu-git
 	pkgdesc = Standalone RTL8188EU driver
 	pkgver = 1.0.c5113ff
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/lwfinger/rtl8188eu
 	arch = i686
 	arch = x86_64
@@ -13,9 +13,7 @@ pkgbase = rtl8188eu-git
 	makedepends = linux>=4.12
 	makedepends = linux<4.13
 	source = rtl8188eu-git-1.0.c5113ff::git+https://github.com/lwfinger/rtl8188eu
-	source = dkms.conf
 	sha256sums = SKIP
-	sha256sums = 1201c9d0d52dc4b140f3b20198410ade2ab3e8ed92f90d53ac72a79425126e9b
 
 pkgname = rtl8188eu-git
 	install = rtl8188eu.install
diff --git a/.gitignore b/.gitignore
index a4025b82f387..a771dec2e4ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!dkms.conf
 !rtl8188eu.install
diff --git a/PKGBUILD b/PKGBUILD
index 196a190a5b4c..df91c5e3db0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,16 +7,14 @@ _pkgname=rtl8188eu
 _pkgver=1.0
 _extramodules=extramodules-4.12-ARCH
 pkgver=1.0.c5113ff
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone RTL8188EU driver"
 url="https://github.com/lwfinger/rtl8188eu"
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('linux-headers>=4.12' 'linux-headers<4.13' 'linux>=4.12' 'linux<4.13')
-source=("$pkgbase-$pkgver::git+${url}"
-	'dkms.conf')
-sha256sums=('SKIP'
-	    '1201c9d0d52dc4b140f3b20198410ade2ab3e8ed92f90d53ac72a79425126e9b')
+source=("$pkgbase-$pkgver::git+${url}")
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "${pkgbase}-${pkgver}"
@@ -25,11 +23,20 @@ pkgver() {
 	echo $(echo ${_pkgver}. && git rev-parse --short HEAD) | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g;s/\.rc/rc/;s/ //g'
 }
 
+prepare() {
+	cd "${pkgbase}-${pkgver}"
+
+	# Set name and version for dkms.conf
+	sed -e "s/PACKAGE_NAME=\"8188eu\"/PACKAGE_NAME=${_pkgname}/" \
+		-e "s/PACKAGE_VERSION=\"1.0\"/PACKAGE_VERSION=${pkgver}/" \
+		-i dkms.conf
+}
+
 build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
+	cd "${pkgbase}-${pkgver}"
 
 	_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-	make all ${MAKEFLAGS} KDIR=/lib/modules/${_kernver}/build
+	make all ${MAKEFLAGS} KSRC=/lib/modules/${_kernver}/build
 }
 
 package_rtl8188eu-git() {
@@ -38,7 +45,7 @@ package_rtl8188eu-git() {
 	provides=('8188eu' "${_pkgname}")
 	install=rtl8188eu.install
 
-	cd "${srcdir}/${pkgbase}-${pkgver}"
+	cd "${pkgbase}-${pkgver}"
 
 	install -Dm644 8188eu.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/8188eu.ko
 	gzip "${pkgdir}/usr/lib/modules/${_extramodules}/8188eu.ko"
@@ -53,17 +60,10 @@ package_rtl8188eu-dkms-git() {
 	# - Arpan "rpn" Kapoor	<k.arpan26@gmail.com>
 	# - Runnytu		<runnytu@gmail.com>
 
-	cd "${srcdir}"
-
 	local install_dir="${pkgdir}/usr/src/${pkgbase}-${pkgver}"
 
 	# Copy dkms.conf
-	install -Dm644 dkms.conf "${install_dir}/dkms.conf"
-
-	# Set name and version
-	sed -e "s/@_PKGNAME@/${_pkgname}/" \
-		-e "s/@PKGVER@/${pkgver}/" \
-		-i "${install_dir}/dkms.conf"
+	install -Dm644 ${pkgbase}-${pkgver}/dkms.conf "${install_dir}/dkms.conf"
 
 	# Copy sources
 	cd "${pkgbase}-${pkgver}"
diff --git a/dkms.conf b/dkms.conf
deleted file mode 100644
index 0f7c986e52da..000000000000
--- a/dkms.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-PACKAGE_NAME="@_PKGNAME@"
-PACKAGE_VERSION="@PKGVER@"
-MAKE[0]="CONFIG_RTL8188EU=m make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build modules"
-BUILT_MODULE_NAME[0]="@_PKGNAME@"
-DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless"
-AUTOINSTALL="yes"