fixed up pkgbase, source, and build logic; upgrade pkgver to repo commit c5113ff

5 files changed, 110 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ec3bb124342..eec07316ad11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,35 @@
 # Generated by mksrcinfo v8
-# 日 12月  6 16:10:44 UTC 2015
+# Thu Aug  3 10:34:56 UTC 2017
 pkgbase = rtl8188eu-git
-	pkgdesc = RTL8188EU driver
-	pkgver = 396d6c1
+	pkgdesc = Standalone RTL8188EU driver
+	pkgver = 1.0.c5113ff
 	pkgrel = 1
 	url = https://github.com/lwfinger/rtl8188eu
-	install = rtl8188eu.install
 	arch = i686
 	arch = x86_64
-	license = GPL
-	source = https://codeload.github.com/lwfinger/rtl8188eu/tar.gz/396d6c1
-	sha256sums = 141f98d144d646485d972040b44b9cf1382a4e3e180bc9d073cdc18fad55ac0c
+	license = GPL2
+	makedepends = linux-headers>=4.12
+	makedepends = linux-headers<4.13
+	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
+	depends = linux>=4.12
+	depends = linux<4.13
+	provides = 8188eu
+	provides = rtl8188eu
+	conflicts = 8188eu
+	conflicts = rtl8188eu
+
+pkgname = rtl8188eu-dkms-git
+	depends = dkms
+	provides = 8188eu
+	provides = rtl8188eu
+	conflicts = 8188eu
+	conflicts = rtl8188eu
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a4025b82f387
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*
+!.gitignore
+!PKGBUILD
+!.SRCINFO
+!dkms.conf
+!rtl8188eu.install
diff --git a/PKGBUILD b/PKGBUILD
index 62d017dd8cfd..196a190a5b4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,73 @@
-# Maintainer: Masanori Ohgita <mp_aur[at]ohgita[dot]info>
-pkgname=rtl8188eu-git
-pkgver=396d6c1
+# Maintainer: Tom Nguyen <tom81094@gmail.com>
+# Contributor: Masanori Ohgita <mp_aur[at]ohgita[dot]info>
+
+pkgbase=rtl8188eu-git
+pkgname=(rtl8188eu-git rtl8188eu-dkms-git)
+_pkgname=rtl8188eu
+_pkgver=1.0
+_extramodules=extramodules-4.12-ARCH
+pkgver=1.0.c5113ff
 pkgrel=1
-pkgdesc="RTL8188EU driver"
+pkgdesc="Standalone RTL8188EU driver"
 url="https://github.com/lwfinger/rtl8188eu"
 arch=('i686' 'x86_64')
-license=('GPL')
-builddepends=('linux-headers')
-source=(
-	"https://codeload.github.com/lwfinger/rtl8188eu/tar.gz/${pkgver}"
-)
-sha256sums=(
-	'141f98d144d646485d972040b44b9cf1382a4e3e180bc9d073cdc18fad55ac0c'
-)
-install=rtl8188eu.install
-
-_reponame='rtl8188eu'
+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')
 
-build() {
-	
-	cd "${srcdir}/${_reponame}-${pkgver}/"
-	make all $MAKEFLAGS
+pkgver() {
+	cd "${pkgbase}-${pkgver}"
+
+	#git describe --long | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g;s/\.rc/rc/'
+	echo $(echo ${_pkgver}. && git rev-parse --short HEAD) | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g;s/\.rc/rc/;s/ //g'
 }
 
-package() {
-	
-	cd "${srcdir}/${_reponame}-${pkgver}/"
-	_kver=$(uname -r)
-		
-	mkdir -p "${pkgdir}/lib/modules/${_kver}/kernel/drivers/net/wireless"
-	install -p -m 644 8188eu.ko "${pkgdir}/lib/modules/${_kver}/kernel/drivers/net/wireless"
+build() {
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 
-	mkdir -p "${pkgdir}/lib/firmware/"
-        cp rtl8188eufw.bin "${pkgdir}/lib/firmware/"
+	_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+	make all ${MAKEFLAGS} KDIR=/lib/modules/${_kernver}/build
+}
+
+package_rtl8188eu-git() {
+	depends=('linux>=4.12' 'linux<4.13')
+	conflicts=('8188eu' "${_pkgname}")
+	provides=('8188eu' "${_pkgname}")
+	install=rtl8188eu.install
 
-        mkdir -p "${pkgdir}/lib/firmware/rtlwifi"
-        cp rtl8188eufw.bin "${pkgdir}/lib/firmware/rtlwifi/"
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 
+	install -Dm644 8188eu.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/8188eu.ko
+	gzip "${pkgdir}/usr/lib/modules/${_extramodules}/8188eu.ko"
 }
 
+package_rtl8188eu-dkms-git() {
+	depends=('dkms')
+	conflicts=('8188eu' "${_pkgname}")
+	provides=('8188eu' "${_pkgname}")
+
+	# dkms build reference and credit to:
+	# - 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"
+
+	# Copy sources
+	cd "${pkgbase}-${pkgver}"
+
+	for d in $(find . -type d); do install -dm755 "${install_dir}/$d"; done
+	for f in $(find . -type f); do install -m644 "$f" "${install_dir}/$f"; done
+}
diff --git a/dkms.conf b/dkms.conf
new file mode 100644
index 000000000000..0f7c986e52da
--- /dev/null
+++ b/dkms.conf
@@ -0,0 +1,6 @@
+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"
diff --git a/rtl8188eu.install b/rtl8188eu.install
index 300a63547c9e..0e3ca5b3b371 100644
--- a/rtl8188eu.install
+++ b/rtl8188eu.install
@@ -1,7 +1,13 @@
 post_install() {
-	_kver=$(uname -r)
-	echo -e "\nPlease run following command by yourself:\n"
-	echo "sudo depmod -a ${_kver}"
-	echo -e "sudo modprobe 8188eu\n"
+    EXTRAMODULES='extramodules-4.12-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
 }