upgpkg: iwlwifi 2020.04.17.r0.g7219a63ab-1

1 files changed, 10 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1e28916242f5..d0db58e50d0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=iwlwifi
-pkgver=2018.03.19.r0.g9f4ef1d70
+pkgver=2020.04.17.r0.g7219a63ab
 pkgrel=1
 pkgdesc="Intel wireless chips driver (current kernel release cycle)"
 arch=('i686' 'x86_64')
@@ -10,28 +10,26 @@ license=('GPL')
 makedepends=('git' 'linux-headers' 'xz')
 #source=('git+https://kernel.googlesource.com/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git')
 #sha256sums=('SKIP')
-#validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
-#              '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman
 
 
 _gitsource="https://kernel.googlesource.com/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git"
-_gittag="iwlwifi-for-kalle-2018-03-19"  # $(git ls-remote --refs --sort -v:refname "$_gitsource" "iwlwifi-*" | grep -m 1 -o "iwlwifi.*")
+_gittag="iwlwifi-sent-for-review-2020-04-17"  # $(git ls-remote --refs --sort -v:refname "$_gitsource" "iwlwifi-next*" | grep -m 1 -o "iwlwifi.*")
 _moduleSrc="iwlwifi-fixes/drivers/net/wireless/intel/iwlwifi"
 
 prepare() {
   cd "$srcdir"
   if [ ! -d "iwlwifi-fixes" ]; then
-    git clone --branch "$_gittag" "$_gitsource" --depth 1
+    git clone --single-branch --branch "$_gittag" --depth 1 "$_gitsource"
   fi
 
-  cd "$srcdir/iwlwifi-fixes"
+  cd "iwlwifi-fixes"
   git checkout tags/"$_gittag"
 }
 
 pkgver() {
-  cd "$srcdir/$_moduleSrc"
+  cd "$_moduleSrc"
 
-  _tag=$(sed 's/iwlwifi-for-kalle-//;s/-/./g' <<< "$_gittag")
+  _tag=$(sed 's/iwlwifi[^0-9]*//;s/-/./g' <<< "$_gittag")
   _hash=$(git rev-parse --short HEAD)
   _rev=$(git rev-list --count "$_hash"..HEAD)
   printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash"
@@ -42,19 +40,12 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_moduleSrc"
+  cd "$_moduleSrc"
 
   find './' -name '*.ko' -exec xz -0 --force {} \;
 
   _updates="/usr/lib/modules/$(uname -r)/updates"
-
-  install -Dm644 'iwlwifi.ko.xz' "$pkgdir/$_updates/iwlwifi.ko.xz"
-
-  pushd "dvm"
-  install -Dm644 'iwldvm.ko.xz' "$pkgdir/$_updates/iwldvm.ko.xz"
-  popd
-
-  pushd "mvm"
-  install -Dm644 'iwlmvm.ko.xz' "$pkgdir/$_updates/iwlmvm.ko.xz"
-  popd
+  install -Dm644 "iwlwifi.ko.xz" -t "$pkgdir/$_updates"
+  install -Dm644 "dvm/iwldvm.ko.xz" -t "$pkgdir/$_updates"
+  install -Dm644 "mvm/iwlmvm.ko.xz" -t "$pkgdir/$_updates"
 }