add dkms.conf & cleanup

3 files changed, 38 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1bef2d1ecb0..76354fa6a03b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = 8188eu-dkms-git
 	pkgdesc = Standalone driver for Realtek RTL8188EUS (RTL8188EUS, RTL8188ETV) WLAN
-	pkgver = 1.0.ab19e22
-	pkgrel = 2
+	pkgver = 5.2.2.4.r767.33dbf80
+	pkgrel = 1
 	url = https://github.com/lwfinger/rtl8188eu
 	arch = any
-	license = GPL
+	license = GPL2
+	makedepends = git
 	depends = dkms
+	provides = 8188eu-dkms
 	conflicts = 8188eu-dkms
-	conflicts = rtl8188eu-dkms
-	conflicts = rtl8188eu-dkms-git
-	conflicts = rtl8188eu-git
 	source = 8188eu::git+https://github.com/lwfinger/rtl8188eu#branch=v5.2.2.4
 	source = blacklist-r8188eu.conf
+	source = dkms.conf
 	sha256sums = SKIP
 	sha256sums = edaeafe28410017fabb742d6ccdf060a945150fb56e41084adb7b9dd66739e2b
+	sha256sums = 70db4a4d738e77952dd063fc066f961932112786d796dcdb4508f4ec9c5ef844
 
 pkgname = 8188eu-dkms-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3b293119a00a..7774d49b8dca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,71 +1,50 @@
-# Maintainer: Laszlo Papp <lpapp@kde.org>
+# Maintainer: Robert Cegliński <rob.ceglinski@gmail.com>
+# Contributor: Laszlo Papp <lpapp@kde.org>
 # Contributor: Alexander Blinne <alexander@blinne.net>
 
 _pkgname=8188eu
 pkgname="${_pkgname}-dkms-git"
-_pkgver=1.0
-pkgver=1.0.ab19e22
-pkgrel=2
+_pkgver=5.2.2.4
+pkgver=5.2.2.4.r767.33dbf80
+pkgrel=1
 pkgdesc='Standalone driver for Realtek RTL8188EUS (RTL8188EUS, RTL8188ETV) WLAN'
 arch=('any')
 url="https://github.com/lwfinger/rtl8188eu"
-license=('GPL')
+license=('GPL2')
 depends=('dkms')
-_branch="v5.2.2.4"
-source=("${_pkgname}::git+${url}#branch=${_branch}"
-        blacklist-r8188eu.conf)
+makedepends=('git')
+source=("${_pkgname}::git+${url}#branch=v${_pkgver}"
+        blacklist-r8188eu.conf
+        dkms.conf)
 sha256sums=('SKIP'
-            'edaeafe28410017fabb742d6ccdf060a945150fb56e41084adb7b9dd66739e2b')
-conflicts=('8188eu-dkms' 'rtl8188eu-dkms' 'rtl8188eu-dkms-git' 'rtl8188eu-git')
+            'edaeafe28410017fabb742d6ccdf060a945150fb56e41084adb7b9dd66739e2b'
+            '70db4a4d738e77952dd063fc066f961932112786d796dcdb4508f4ec9c5ef844')
+provides=('8188eu-dkms')
+conflicts=('8188eu-dkms')
 
 pkgver() {
   cd "${_pkgname}"
 
-  echo $(echo ${_pkgver}. && git rev-parse --short HEAD) | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g;s/\.rc/rc/;s/ //g'
+  echo "${_pkgver}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
-
-prepare() {
-  cd "${_pkgname}"
-
-  local i; for i in "${source[@]}"; do
-    case $i in
-      *.patch)
-        msg2 "Applying patch ${i}"
-        patch -p1 -i "${srcdir}/${i}"
-    esac
-  done
-
-  # Disable power saving
-  sed -i 's/^CONFIG_POWER_SAVING \= y/CONFIG_POWER_SAVING = n/' Makefile
-}
-
-build() {
-  cd "${_pkgname}"
-
-  # 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
-}
-
-
 package() {
-  cd "${srcdir}"
-
   local install_dir="${pkgdir}/usr/src/${_pkgname}-${pkgver}"
 
   # Blacklist r8188eu
-  install -Dm644 blacklist-r8188eu.conf "${pkgdir}/etc/modprobe.d/r8188eu.conf"
+  install -Dm644 blacklist-r8188eu.conf \
+    "${pkgdir}/etc/modprobe.d/blacklist-r8188eu.conf"
+
+  install -Dm644 dkms.conf "${install_dir}/dkms.conf"
 
   # Copy sources
   cd "${_pkgname}"
 
-  for d in $(find . -type d); do
-    install -dm755 "${install_dir}/$d"
+  for d in "core" "hal" "include" "os_dep"; do
+    for f in $(find "$d" -type f); do
+      install -Dm644 "$f" "${install_dir}/$f"
+    done
   done
 
-  for f in $(find . -type f); do
-    install -m644 "$f" "${install_dir}/$f"
-  done
+  install -m644 "Makefile" "${install_dir}/Makefile"
 }
diff --git a/dkms.conf b/dkms.conf
new file mode 100644
index 000000000000..ed33a6e4face
--- /dev/null
+++ b/dkms.conf
@@ -0,0 +1,7 @@
+PACKAGE_NAME="8188eu"
+PACKAGE_VERSION="5.2.2.4"
+BUILT_MODULE_NAME[0]="8188eu"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless/"
+AUTOINSTALL="yes"
+MAKE[0]="'make' modules CONFIG_POWER_SAVING=n KVER=${kernelver} -j`nproc`"
+CLEAN="'make' clean"