rhssk/pkgbuilds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtl88x2bu-openhd-dkms-git: remove upstreamed patch

Browse Source
This commit is contained in:
Rihards Skuja 2024-06-20 11:37:17 +03:00
parent 2f693a9896
commit 0a3595eb9c
Signed by: rhssk
GPG Key ID: E3BF73E10BFF4DF3
3 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl88x2bu-openhd-dkms-git/.SRCINFO
View File

@ -1,7 +1,7 @@
pkgbase = rtl88x2bu-openhd-dkms-git pkgbase = rtl88x2bu-openhd-dkms-git
pkgdesc = Realtek RTL88x2BU WiFi USB driver (with OpenHD patches) pkgdesc = Realtek RTL88x2BU WiFi USB driver (with OpenHD patches)
pkgver = 5.13.1.r227.g9571cc7 pkgver = 5.13.1.r229.g0f4686b
pkgrel = 6 pkgrel = 7
url = https://github.com/OpenHD/rtl88x2bu url = https://github.com/OpenHD/rtl88x2bu
arch = any arch = any
license = GPL2 license = GPL2
@ -9,8 +9,6 @@ pkgbase = rtl88x2bu-openhd-dkms-git
depends = dkms depends = dkms
depends = bc depends = bc
source = git+https://github.com/OpenHD/rtl88x2bu.git source = git+https://github.com/OpenHD/rtl88x2bu.git
source = fix-6.9.0-build.patch
sha256sums = SKIP sha256sums = SKIP
sha256sums = fd6afeadc4b00b74d9ed870fe446ffcc0773d07364fb7ed07f538b0ca07507ed
pkgname = rtl88x2bu-openhd-dkms-git pkgname = rtl88x2bu-openhd-dkms-git

13
rtl88x2bu-openhd-dkms-git/PKGBUILD
View File

@ -2,28 +2,23 @@
pkgname=rtl88x2bu-openhd-dkms-git pkgname=rtl88x2bu-openhd-dkms-git
_modname=88x2bu_ohd _modname=88x2bu_ohd
pkgver=5.13.1.r227.g9571cc7 pkgver=5.13.1.r229.g0f4686b
_pkgver=5.13.1 _pkgver=5.13.1
pkgrel=6 pkgrel=7
pkgdesc='Realtek RTL88x2BU WiFi USB driver (with OpenHD patches)' pkgdesc='Realtek RTL88x2BU WiFi USB driver (with OpenHD patches)'
arch=(any) arch=(any)
url='https://github.com/OpenHD/rtl88x2bu' url='https://github.com/OpenHD/rtl88x2bu'
license=(GPL2) license=(GPL2)
depends=(dkms bc) depends=(dkms bc)
makedepends=(git) makedepends=(git)
source=('git+https://github.com/OpenHD/rtl88x2bu.git' 'fix-6.9.0-build.patch') source=('git+https://github.com/OpenHD/rtl88x2bu.git')
sha256sums=('SKIP' 'fd6afeadc4b00b74d9ed870fe446ffcc0773d07364fb7ed07f538b0ca07507ed') sha256sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/rtl88x2bu" cd "${srcdir}/rtl88x2bu"
printf '%s.r%s.g%s' "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)" printf '%s.r%s.g%s' "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
} }
prepare() {
cd "${srcdir}/rtl88x2bu"
patch -p1 -i "$srcdir/fix-6.9.0-build.patch"
}
package() { package() {
cd "${srcdir}/rtl88x2bu" cd "${srcdir}/rtl88x2bu"
mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}" mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}"

26
rtl88x2bu-openhd-dkms-git/fix-6.9.0-build.patch
View File

@ -1,26 +0,0 @@
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index 1c1c3c4..76d71f4 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -454,7 +454,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
if (started) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0))
+ cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false);
@@ -479,7 +481,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
goto exit;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0))
+ cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);