Change package for raspberrypi and kernel 4.19

Signed-off-by: Aviv BD <bd.aviv@gmail.com>

4 files changed, 40 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf55fe568bcf..4e6086f2f51c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
-pkgbase = rtl8822bu-dkms-git
-	pkgdesc = Kernel module for Edimax EW7822ULC USB3 and Asus AC53 Nano USB 802.11ac adapter.
-	pkgver = 20180723
-	pkgrel = 9
+pkgbase = rtl8822bu-dkms-raspberrypi
+	pkgdesc = Kernel module for Edimax EW7822ULC USB3 and Asus AC53 Nano USB 802.11ac adapter. (for raspberrypi)
+	pkgver = 1.0
+	pkgrel = 1
 	url = https://github.com/MeissnerEffect/rtl8822bu
-	install = rtl8822bu-dkms-git.install
+	install = rtl8822bu-dkms-raspberrypi.install
 	arch = armv7h
-	arch = x86_64
 	license = GPL
 	makedepends = git
 	depends = dkms
-	source = git+https://github.com/MeissnerEffect/rtl8822bu.git
+	conflicts = rtl8822bu-dkms-git
+	source = git+https://github.com/MeissnerEffect/rtl8822bu.git#commit=dea3bb8e631191ded1839c53fb266d80ef7e8ad3
 	source = dkms.conf
+	source = rpi.patch
 	sha256sums = SKIP
-	sha256sums = 09dbc7aa2954d0b66bf8d6676b996f154821107b72e4c0e901a14b70c64fbbe3 
+	sha256sums = 09dbc7aa2954d0b66bf8d6676b996f154821107b72e4c0e901a14b70c64fbbe3
+	sha256sums = 1231ecd3d8937fa6e626b5b265a6ee2a7299cb2f7e8a2b19f60ae3875bf9142d
 
-pkgname = rtl8822bu-dkms-git
+pkgname = rtl8822bu-dkms-raspberrypi
 
diff --git a/PKGBUILD b/PKGBUILD
index 5504da3a4292..ea53d978855b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,34 @@
-# Maintainer: William Grunow <william.grunow93@gmail.com>
+# forked from: William Grunow <william.grunow93@gmail.com>
 # Contributer: Andreas Manthey <abamanthey@gmail.com>
-pkgname=rtl8822bu-dkms-git
+pkgname=rtl8822bu-dkms-raspberrypi
 _pkgbase=rtl8822bu
-pkgver=20180723
-pkgrel=9
-pkgdesc="Kernel module for Edimax EW7822ULC USB3 and Asus AC53 Nano USB 802.11ac adapter."
+pkgver=1.0
+pkgrel=1
+pkgdesc="Kernel module for Edimax EW7822ULC USB3 and Asus AC53 Nano USB 802.11ac adapter. (for raspberrypi)"
 url="https://github.com/MeissnerEffect/rtl8822bu"
 license=("GPL")
-arch=('armv7h' 'x86_64')
+arch=('armv7h')
 makedepends=('git')
 depends=('dkms')
-source=('git+https://github.com/MeissnerEffect/rtl8822bu.git'  
+conflicts=('rtl8822bu-dkms-git')
+source=('git+https://github.com/MeissnerEffect/rtl8822bu.git#commit=dea3bb8e631191ded1839c53fb266d80ef7e8ad3'
         'dkms.conf'
+        'rpi.patch'
         )
 sha256sums=('SKIP'
             '09dbc7aa2954d0b66bf8d6676b996f154821107b72e4c0e901a14b70c64fbbe3'
-           )
+            '1231ecd3d8937fa6e626b5b265a6ee2a7299cb2f7e8a2b19f60ae3875bf9142d'
+            )
 install="${pkgname}.install"
 prepare() {
   sed -e "s/@PKGNAME@/${_pkgbase}/" \
       -e "s/@PKGVER@/${pkgver}/" \
       -i "${srcdir}/dkms.conf"      
+
+  (cd "$srcdir/" && patch --strip=1 --input=rpi.patch)
+
   (cd ${srcdir}/${_pkgbase} )
+
 }
 package() {
   install -D "${srcdir}/dkms.conf" "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
diff --git a/rpi.patch b/rpi.patch
new file mode 100644
index 000000000000..fc0aeb9c3685
--- /dev/null
+++ b/rpi.patch
@@ -0,0 +1,14 @@
+diff '--color=auto' --unified --recursive --text package.orig/rtl8822bu/Makefile package.new/rtl8822bu/Makefile
+--- package.orig/rtl8822bu/Makefile	2019-10-27 14:09:55.766638100 +0200
++++ package.new/rtl8822bu/Makefile	2019-10-27 14:12:09.016265684 +0200
+@@ -97,8 +97,8 @@
+ ###################### MP HW TX MODE FOR VHT #######################
+ CONFIG_MP_VHT_HW_TX_MODE = n
+ ###################### Platform Related #######################
+-CONFIG_PLATFORM_I386_PC = y
+-CONFIG_PLATFORM_ARM_RPI = n
++CONFIG_PLATFORM_I386_PC = n
++CONFIG_PLATFORM_ARM_RPI = y
+ CONFIG_PLATFORM_ANDROID_X86 = n
+ CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
+ CONFIG_PLATFORM_JB_X86 = n
diff --git a/rtl8822bu-dkms-git.install b/rtl8822bu-dkms-raspberrypi.install
index 8d63b87b187e..8d63b87b187e 100644
--- a/rtl8822bu-dkms-git.install
+++ b/rtl8822bu-dkms-raspberrypi.install